Ironed out bugs in M4L