timing and dictionary tweaks