Enhancing Multiple-Choice Questions