minor edit

reorganized a bit...and made win condition work