M Tools improvements