fixed issues with terms of service and questionnaire