more scheduling software changes

debug and run testing