Clean Up

I have worked on cleaning up the match script a bit. Fixed the last
problem bug on the quiz.