Mainly HeightMap improvements