line 434: need to fix dictionary lookup.
Added some other stuff, I think. Can't remember. I should commit more often.