Cleanup and terrain work.

Terrain is now showing.