Various grammar fixes