More work on cities

Fixed some bugs, more work on city management terminal