More grammar improvements