add over null iso countries
change color slavery -> rank
fixes
Merge branch 'master' into gh-pages