Fixed socket events sometimes not being handled client side
Added trigger adding/removing functions