some minor tweaks to index, not sure if you agree @TiarkRompf -- feel free to revert