heightmap toggling, some shadow mapping work
resolving merge conflicts