Bugfixes, improving UI feedback to user