Fixed bugs with Set gameplay. Should work and do matching correctly now
Checkin. Things broke after merge. Will investigate...