Reformat Q&A; add answers to most of the TODOs