i think i fixed some issues?