Updated makefile
Better heightmap fail and filename
More moving to objects