some fixes
moved