updating headers and comments