various fixes to markup.