Changed some of @krmarien's comments
Quiz Fix