add new words and fix bugs