Sorting...slowly, the country names on tooltips
A Merge, for all the wrong reasons
Fixed merge conflict working on the same thing as Danny