Added \index commands and fixed comments in discussion