little more markup improvements