Added proper support for multiple choice/answer questions. Optimized some code.