Additions and fixes to client list