update grammar and syntax from Jacob's review