Bugfixes & Added UI abort