small cleanup of server and city model; tests still in progress