disconnect handling changes (in progress), correct bad commit