MPI version debugged; small improvements