scripts: country-mapping imrovements + formatting