Second switching the water container. The one you have is a leak-o-matic. Equally cheap and much better would be recycled Gatorade or sport drink bottles. If water is critical, separate bottles are better than one container. Depending on your location, three liters might or might not be adequate. Coming from a desert background, I doubt you can have too much drinkable water.