CMFM: Fixes and Improvements