Added saving of plots and save names for output files