I was thinking a compact Surefire LED light, costs more but blows the maglite LED out of the water. Also, I agree with leathermans and gloves ( i need a new pair). I might even think a professional copy of vectorworks could do no harm.
Have you seen the 100 lumen LED upgrade for your old fashioned AA Mag? Same output as the $190 Surefire L5 LED... and it uses AA batteries instead of the more expensive lithiums.
They also make an 80 lumen Red model which would be cool. Then there's the 140 lumen upgrade kit for my big 3 D battery Mag. That would be sweet camping.
I've got to get some of these.