not too many changes, some city stuff