i think i fixed some things