changes to plotting
merge