Fixed score in 3-card-match mode and other fixes