Fixed a few dict bugs created more . . .