Some grammar improvements