Minor changes to grammar and generator