Repaired a few bugs concerning the input
Merge branch 'master' of https://github.com/Mikkomario/RaceKingdoms