Moved city out of tile types, added drawing of city.