Minor content changes.
Directives for trees.
Minor changes.
Refactoring.