Added back in water.
Fixed connections involving water
Bigger map, longer run