bugfix

additional bugfixes