Made fixes to CH1, and extended Ch2