questionnaire improved. minor bug fixes