Question order updates/wording changes

per Ben's Aug 08 email. Also some small db structure updates.