Lots of CMS updates for IJ