2 CMTSes; config
Cleanups; additional cmts