add timer to schedule
remove timer from schedule
some fixes