Markup fixes, typos, and other minor things