Add logs + minor fix