More work around world map, places and comments