more timing and small fixes