fixes and win scenario complete