Fix country rankings and math errors