Both my roof and hand lamps have seen better days. Being so long since I had to purchase these I'm a bit out of touch with what's on offer. My current roof lamp is an older lightforce and my handlamp a Clulite. For the hand lamp I'd like 1 million CP minimum in a small compact light and possibly mountable on top of the rifle. I'm also looking for a Li-on battery pack. What's out there at the moment and what's your recommendations?