further mods to questionnaire / skip button to overcome bugs