Changed comment and debug output