some fixes
some fixes