add comments, cases, quantifiers