small bug fixes with map loading