i think i fixed some stuff