more fixes to tree