some timer fixes