New Parser parts and more Dictionary stuff

Dictionaries now built from puzzle successfully.