more prep for R 3.
Improvements to plot.