Quick fixes for cancel function

Should be working fully now