Capture city work on client, lot of bug fixed