Add future cancellation, small improvements.