math and omni-tree improvements