DictNavigator bugs ironed out via testing.
DictNavigator bugs ironed out via testing.