More fixes of words.