Add logs, cleanup