Final edits- comments and dictionary

A couple of dictionary changes, and added some better comments in the
code.
Removed old file