fix boxxy yet again
this was necessary
even more ugly fixes
FUCKING JASPERVDJ
can't believe i am doing this
Merge branch 'fix-boxxy'