some fixes
some fixes 2