Created attachment 218860 [details]
Resulting PDF screen shoot with index improvements 

Two improvements for the index:

1. Correct name for Class Hierarchy in index

\chapter{Class Index}
\input{hierarchy}

should be 

\chapter{Class Hierarchy}
\input{hierarchy}

2. General index with an entry in the index

At the end of the TEX document, 

\printindex
\end{document}

doesn't generate a chapter "Chapter 9 — General Index" with an entry in the Index.

I've tried 

\chapter{General Index}
\label{General Index}
\printindex
\end{document}

with the resulting example attached. 

But "Chapter 9 — General Index" is printed in one page and "Index" with the index is on another page.

Thank you!