more clean-up
switched world map