Improved MH with scaling and tolerance handling

And command line args