Oh the shit i write when i'm falling asleep... here are some fixes