added Match processing (in addition to game and set); corrected game and set processing