tree control and bug fix.