Changes to plot() and other minor changes