Modifications to DEBUG

Incorporated debug printing changes by itavero.  Makes printing
behavior more consistent