various bug fixes & questionnaire feature