Fix

reschedule fix (rescheduling should always be successful, otherwise
crash)
comments added