bugfix

some small changes