Various Style and Markup Fixes.