major improvements to cancellation handling