Get world map working and other fixes