some fixes
some fix