Many fixes; when using MPI the world seems to be divided.