some fixes
some fixes again