Various grammar improvements.