cmseditor improvements