Correct comments and debug messages