Various tweaks
Merge branch 'master' of https://github.com/soundintheory/fuel-cmf