Grammar update and clarification