More terrain work
Resolved merge conflicts