Update to address comments.

Also: fix formatting, add TOC macro, improve screen shot.