Cancellation support + Bugfixing + UI tweaks