add city if missing
cleanups