improved world map, working on igeo