Some commenting and fixing for schedules, now they work