Corrections after adding the comment field.