more parser changes
Merge pull request #3 from margaretleedees2/emilysbranch

more parser changes