more water tweaking
merge commit
Fixed terrain collapsing