WIP grammar improvements