Fixed cancel and added handling of the glare case

I still haven't started working with multiple calls.