Fixing my mistakes

Fixing all the stuff i did wrong before it has a chance to mess up games.
Merge pull request #215 from BeastCharizard/patch-2

Fixing my mistakes