Working on bugs in OnSchedule Calculator