Fixed a variety of bugs.  Added a real(er) dictionary for future
use.