Grammar modifications from Haley's feedback