Fixed some plots
Updated plots and lables