Fixing some mistakes, must've been asleep already..