-FIX: Update of treenode did not work, new node is created an replaces the old.
-CHG: Formating, cleanup