Markup and Comment improvements