0.3.1.2

More Work on the tree and Clean up