Quiz bugfixes