add logs + small fix