some state handling adjustments and initial abort support.