Fixed a few bugs with dictionaries, and removed a lot of output