Comments and DEBUG_MODE added

Code and comments clean-up.
There is now a DEBUG_MODE to control the echo on standard output.