The information about Glorfindal and the prophesy must have been in one of the appendices. I'm pretty sure it's not in the main book and it would have been too late period for The Silmarillion.
I think another name for Saruman was Curunir.
What was the name of Aragorn's heir?
John