Fixes to add spectra and such