final updates to CMS build