Merged our updates

Just merged my updates with yours for the document update.  I can't get
the question area working.