bugfixes
other fixes from bugtracking