Added better heightmap, set testing defaults, and some cleanup.