If you want to take the next step with lighting and use 18650 batteries, I have found the Solarforce L2 with their recommended drop-in to be great.

The price for their flashlight shell (Host) is $13. I recommend this drop-in...$18 bucks, sheess, you can't go wrong..http://www.lighthound.com/Solar-Forc...In_p_3610.html

It has served me well over the last couple months. Puts out more light than my TerraLux and lasts longer too. Not dissing the Terralux - it does what its batteries allow it to do. The AA Terralux just can not compete with a 18650 assuming the same size light.

If you need spill, I would go with the Romisen RC-C8 II Q5. It is fantastic for 18650 batteries. It does not throw as well as the Solarforce...but, oh my, does it not put a good spill out there.