Added ability to set default country
Various tweaks