Standardize h2 and h3 tags. Misc fixes