Fix bug allowing the returned value to be an array
Add annotations on 2D spectra