simplify a bit
reinitialize editor
comment dep management
Merge remote-tracking branch 'origin/questionnaire' into cg-tutorial