Some more logging details and comment edits