has city now
some code clean up, so everything is nicer