some fixes
some fixes
some minor fixes