Fixed standard output plots
Updated standard plots
Merge