not too many changes, some city stuff
Merge pull request #13 from afortune906/master

not too many changes, some city stuff