added working heightmap, gravity
fixing merge errors