Updated to new trees and misc. fixes