Adding logs and small changes