More countries, cleaned up the config file.