EnhanceYourCalm fixes

Fixes #29, #30