Lots of revision on the issue #60 code.
Updated many comments, solved a couple of concurrence issues and
optimized some tree walks.