several changes + CM updates