indexes improved and corrected