more dictionary tweaks