Dunno if i fixed anything, but i'll check it in