World Map and minor adjustments