some fixes

yeah