debug mpi repair ; started to reorganize code