Fixed stupid shit
Fixed more stuff hopefully