Bug fixes
quiz fix