Good ideas!
Also, don't use empty milk jugs to store water. Use clean soda bottles.
Water for drinking only. If you run out of water, turn off your water heater in your home, UNPLUG it, let it cool down. You can drink that.
Failing to plan is a plan to fail.