Fix comments and query 3