Pointing to MPICH
got rid of index name stuff
More index cleaning up