Improved index code, and coverage