Tweaking the tree

PITA. Closes #24, although the tail call itself still does not work properly