Tree finished & outsourced. Some small general refactoring.