Updates to header and comments