many changes, added bunch of stuff about trees