Better pruning
Recursive pruning. Some more unit tests