I don't really EDC a flashlight, but I do have an Inova micro light in my backpack (I use an Altoids gum tin for a few things, in case I get the urge for a dayhike). There's a small AAA minimag in my FAK in the car, as well as a 3Dmaglight with the LED upgrade. I was wondering if it's best to get another maglight/LED. But, I'm thinking of getting a Fenix, since they sound interesting.

Sounds like the 1gal milk/water isn't a good idea. I do have 1 gallon sitting in a cupboard in the garage, but I think I'll hit the store and try to get a few 1/2 gal. water containers. Nalgene, at this point, is a bit beyond my price range (though I have 3, and don't want to treat water if I can avoid it).