bugfix
bugfixes
usability changes