Added questions and fixed others in survey