bugfix
some fixes