Cleanup victory checks

Fixed victory condition.
Still needs tiebreaker checks.