add new words
fix bugs