bugfixes, GUI improvements