Leaf fixes, new trees, reorganizing