Some more work on the quiz and threading