Bugfixes for rerun and schedule along with more debug()