- [*] various fixes.
- [tree] Code refactoring & Issue #66