Fixed some confusion about connections and khaans

Some lists were being updated based on socketId, not connectionId