Tree Generation changes and Swinging BugFixes