Changes to quiz logic and services