more timer fixes, could be correct