Few more changes, mainly Water

Water is still very much WIP.