Fixed a few more terrain issues. Probably added a few more as well
merge commit