chm enhancements from pulls #22, #23 and #27