More Quiz Generation Updates