Diverse markup fixes.
6 files changed