Refactored Game 2 + some bug fixes