make disconnects and reconnects work a little better