Correct typos and comments