Added country names and other minor tweaks