Still trying to sort out what to do with water. For the time being, fixed the non-continuous heights.
Worked on trying to solve the water problem a bit. I have opted for the simple, coloured surface water. After pondering the options a bit, the others added for little for the complexity of the code needed. This should let me get to new things sooner.