fix up some of the markup