Clean up of comments. A couple of typos