Tool index and edit minor updates