Removed all references to state/country + various cleanups,
rearrangements and bugfixes.