Fixup of markup and minor additions.