ccm

ccm and minor tweaks