CH3: various tweaks
Merge pull request #27 from y-p/CH3_fixes

CH3: various tweaks