Fixed a number of formatting and markup issues