Several fixes
Added cancel request