Fixed game logic, should now be working better