Improved game over conditions and states