Changed to uploading uniform for texture for heightmap. Did minor other changes.