fix conflicting
comments and logging fixes