Eliminated sides, added some helpers for terrain stuff
Fixed conflicts, added some helpers