more index tweaks