Fixes and stuff.

Dictionaries. And a couple random things, I think.