more minor markup improvements