Fixed game mechanics
Merge pull request #25 from ajr2493/mechanics_fixes

Fixed game mechanics