Started hierarchical nodes, more cleanup