Fix up Quizzes
Merge pull request #46 from ds125v/24_dev

Fix up Quizzes