Fix comments and authors