some timer bug fixses