Add TODO comment.
Get rid of invalid TODO comment introduced in previous commit.
Correct a bug on naming secondary contributions plus tertiary excitation attempts.