Made some changes added quizzes