End of Game logic fixes