Fix timer interval
And some more timing tweeks