Makefiles for mpich2 and some corrections to Makefiles