Minor adjustments and combining core with city