Many minor updates to the map