some fixes
some more fixes