[Update] Mostly Water Upgrades

In sections:

Bah...what a pain. Perhaps we should go back to chisel and stone.

Please add comments here to let us know about any problems you discover.

Thanks.
ron