Fixed more problem countries. Began changing map.
Merge changes.