Fix more stuff, god I'm rushed