More work on the map.