fixes to country names

This turned out harder than it should have been, partly because the XML
file that was supplied with the country codes and names wasn't properly
character encoded. Sigh.