Update index.

Integrate Carl and Dirk's suggestions.