some fixes
more test