Various updates for quiz functionality