Commented Tree2D and Constraints. Some refactoring.