EHN: futher merging with plot_spectra
EHN: MAC Heinrich