ok, i think i'm done fixing it...