More grammar updates