further index and dserov tweaks