renamed, now only contains config values for the calais client
The country of the city is also recovered now
ironed out some bugs
renamed