finish correcting index references