Fixed bugs, added formatting for countries