index: even more tweaks.