More work on world map