Fixed adding to the client lists, bug with hashmap still alive