Fix comments and header