Add 'Country Management' Feature, fix minor bugs