End Game cont.

Did some more end of game checks.