HeightMap Fixes

There's still some discontinuity, but we're getting closer to a
seamless heightmap.