Leaf fixes, new trees, reorganizing
Merge pull request #26 from chylex/master

Leaf fixes, new trees, reorganizing