made markup improvements