Markup fix, typo fixes