Many small changes to index.