fixing questions
debgging details
Merge branch 'question-logic' into stage3