Minor bug fixes

Fixed win conditions