I've mentioned this before, but I felt it worth mentioning again. The Water Pump is a great utility, however it draws 1 water per cycle.
Collecting water by hand gathers 5 water at a time.

I'm thinking the water pump should be increased to 10 water per cycle, as it simply does not make sense as it is now.