Allow user-initiated disconnects to be recognized properly. Among formatting updates.