adding comments
merged changes
commiting changes to grammar