Touch up TreeNode
Fix TreeNode some more