Tree and general improvements