Tweaks to grammar