bugfixes and small ui-improvements