Should fix issues when schedules add or delete new schedules. Closes:#510

Also fixes a minor memleak in schedule creation/deletion