Improvements to index doc