sorry about mixed commit - some minor fixes to tree