TrM: more qn types and new MCQ input method