fix timer stuff