adding questions and improving answers