Some formatting, cleanup, and a new chart.