Comment cleanup, and fix for a crash involving being disconnected after failure to connect