nozomi: various changes in cm.mk