Changes to headers and comments