Add additional log
Fix comment
...