Clarified/corrected comments and logging