Changes to Question Stuff

Removed auxiliary questions and did some other stuff