Final cleanup for functions that read in quizdata; small change to main ...

...to work with these changes