More improvements relating to #34, move global operators into Tree/Node