i think i fixed the bugs