Improvements to plot