Correct minor bug fix and add questionnarie comments #2641