Various bugfixes and removed all references to state/country.