Completed solution
Fixed terrain and tidied up