Cleanup & 2 fixes to peer disconnect/kick