Apply comments from @annevk in #72.

@annevk and @marcoscaceres how does that look?

I think it fixes the issues that are fixable in #72. I also removed the "cancel all tasks" because I just have no idea why that's there and it sounds pretty dangerous.