Tree directive improvements and bug fixes