add more dictionary processing, mostly