adding and removing of clients is a bit better now.