Fixes/modifications to Dictionaries.

See issue 18.