fix on_disconnection and work on fixing disaffiliate