Minor improvements
Indexing done