fixed country issues
merged country fixes