Markup fixes.
Merge pull request #775 from larrys/formatfixes

Markup fixes.