index: corrections and cleanup