Makefile.PL more specific
Update changes with git2cl (some manual reordering)