Bugfixes & added UI abort