Correct typo's and improve markup.