Improve trees and fix sounds