ConnectionMonitor work, rdoc, cleanup