lightmap and collision correction + started clean up of maps