tree and verifying that there are no changes). (Also fixed a few bugs that were in the code) svn: r14427 original commit: c0a8a0122200209e38dff1959d79b58f847814db
svn: r8281 original commit: b76aa843ab09e8c1c5f5de9e033b7170ed64acd4