Some more work on the map.