some more vocabulary cleanup, add MFS as 'unigram' model