CMS finished and final tweaks