Grammar updates
More grammar fixes