Fixed some small bugs and started working on the saving redesign of the scheduler