Working on wrong empty determination
Minor modifications to treeview