Indexing is right for energy, peak and resolution now. Also remembered that peak =/= energy. Both have been implemented now.