Bugfixes and completed zip_cities generation code