Fix comments and typos