Updates in the DistanceMeasurerTool and other fixes.