some more fixes

yep