small improvements to water, should now flow slightly slower and be more managable, should also better garrantee internal state
Merge branch 'master' of https://github.com/ZimonD/ContextCG7