more tidyup on index things