tweaks to mcw_classify