more fixes

yeah