Various grammar improvements