Update typos, extra logs and comments