Fix some bugs, and add some words
Add some words for looking up
Fix some bug