Comment and logging fixes