so many fixes

i don’t even know where to begin.

hopefully it’s the last one.