prepare fixes; tree view fixed