Nicer margins and some support for admonitions