Slightly changed output channel state machine + Cosmetics