some fixes
some minor fixes