Updated comments
Updated the debug output.