CIty factory, and Tour improvements.