Update the file with comments and some corrections