Minor changes working towards a tree control.