Added trees and cleaned a bit