CH2: misc fixes
Merge pull request #17 from y-p/CH2

CH2: misc fixes