clean up terrain and make it ready for config
Merge remote-tracking branch 'origin/master'