fixing quiz stuff and removing some more cruft