cleaned up plotting to only plot the current unit. (you can only have one plot per graph anyway)
Merge branch 'plot_improvements' into development