minor format changes; set DistanceConstances.TOLERANCE to 0
brackets inserted