- added Match answer and Matching questions
- minor fixes