fixed some stuff, not sure what i was thinking