further fix in Source to output trace correctly
ShiftScheduler update to work correctly if victim starts off-shif