more timing tweaks