Added name to tree nodes.
minor optimization
added group node