a few more tweaks to spec grammar