organize imports
fixed null pointer error
Added workaround for Tree bugs related to changing hierarchical data.