Improve city stuff a bit.