Added shuffle and more questions.