more fixes

how the heck does this work