removed old world map
comments and cleanup
more clean-up
switched world map