index: some tweaks.