More quiz style alterations