Touch ups to Scheduler and Main