markup improvements