Improved heuristing + tree building + pruning