Update the headers and some of the comments