Switched around city generation a bit