timer improvments