further markup improvements