support providing a distance matrix to the O3A ctor
patch a leak
sync with master