Markup corrections and small fixes