Added to the distro
Debugging refinements