fix saving and timecheck