Fixed win bugs

Should be able to win all ways