Content changes to questions

Content changes to questions in preparation for additional content and
content we already have.