Updated Scheduler and a few other files
Updated Scheduler and a few other files