Did a few updates to City class