Fix most of the comments