more improvements to index