more timing control improvements