CH1: various fixes
Merge pull request #16 from y-p/CH1

CH1: misc fixes