more fixes
some fixes
some more changes