fix word to short-word, and add word_full
fix