fix for various stuff
a bunch of shit broke