tree and verifying that there are no changes). (Also fixed a few bugs that were in the code) svn: r14427
svn: r8764
svn: r8672