Improved game state, fixed rendering bug