Cleaned up TreeCapitator support code and added new trees