changed the extra queries in comments to a join