More improvements to the map