A lot of fixes lol

I'll make sure to keep future PR's separate lol