cleaned up city class, testing code in world controller, and added city portrait