Hopefully fixed some terrain bugs. Something with circle breaks breaking breaks that shouldn't break
merge commit