Improvements to quiz