More changes to plot_X scripts