Some slight changes to the plotting