Some changes to include more info in plots.