Cleaned up and HOPEFULLY fixed the tree problem