Add questions and minor fixes