rearranged some code
Adjusted victory conditions