Improve tree
Fix unexpand_tree()