some fixes

>_