Map couple of countries names fixed.
Code reorganization.