added clients, lots of other changes