slight tweaks to grammar and parser