Fixed some bugs
Improved file that contains tree