Bugfix cancel and abort
Added planned features