updated package name
some cleanup and advanced arguments for m2t tool