some fixes
more