maybe fixed some more stuff?

i literally have no idea what i'm doing