minor tweaks to CMS and otherwise