Added new questions and more options to existing ones