Topic edit optree branches

Re-based.  Edit of branches for opttree.