Fixed some references, added some words in dictionary