Fixed some shit

I blame the movie I watched while coding, these errors are seriously embarrassing.
Will play some tennis and fix the rest later.