minor comment and logging changes