further grammar improvements