fix bad xml; layout, d&c