some fixes, and country added