logic / cleanup

C-S logic wiring completed, timers still at debug rates
Comments cleaned up