[wip] rolling commit
[wip] metric space fixes