--- 1/draft-ietf-i2rs-rib-data-model-11.txt	2018-04-21 02:13:09.819428398 -0700
+++ 2/draft-ietf-i2rs-rib-data-model-12.txt	2018-04-21 02:13:09.931431059 -0700
@@ -7,26 +7,26 @@
                                                                 Ericsson
                                                       H. Ananthakrishnan
                                                            Packet Design
                                                                  S. Kini
                                                               Individual
                                                               N. Bahadur
                                                        Bracket Computing
                                                           April 21, 2018
 
           A YANG Data Model for Routing Information Base (RIB)
-                   draft-ietf-i2rs-rib-data-model-11
+                   draft-ietf-i2rs-rib-data-model-12
 
 Abstract
 
-   This document defines a YANG data model for Routing Information Base
-   (RIB) that aligns with the I2RS RIB information model.
+   This document defines a YANG data model for the Routing Information
+   Base (RIB) that aligns with the I2RS RIB information model.
 
 Requirements Language
 
    The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT",
    "SHOULD", "SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this
    document are to be interpreted as described in RFC 2119 [RFC2119].
 
 Status of This Memo
 
    This Internet-Draft is submitted in full conformance with the
@@ -81,21 +81,21 @@
      8.2.  Informative References  . . . . . . . . . . . . . . . . .  67
    Authors' Addresses  . . . . . . . . . . . . . . . . . . . . . . .  68
 
 1.  Introduction
 
    The Interface to the Routing System (I2RS) [RFC7921] provides read
    and write access to the information and state within the routing
    process that exists inside the routing elements, this is achieved via
    protocol message exchange between I2RS clients and I2RS agents
    associated with the routing system.  One of the functions of I2RS is
-   to read and write data of Routing Information Base (RIB).
+   to read and write data of the Routing Information Base (RIB).
    [I-D.ietf-i2rs-usecase-reqs-summary] introduces a set of RIB use
    cases.  The RIB information model is defined in
    [I-D.ietf-i2rs-rib-info-model].
 
    This document defines a YANG [RFC7950][RFC6991] data model for the
    RIB that satisfies the RIB use cases and aligns with the RIB
    information model.
 
 1.1.  Definitions and Acronyms
 
@@ -812,21 +812,21 @@
 
    o Installed (Indicates whether the route got installed in the FIB) ;
 
    o Active (Indicates whether a route has at least one fully resolved
    nexthop and is therefore eligible for installation in the FIB) ;
 
    o Reason - E.g.  Not authorized
 
    2.  Nexthop resolution status notification
 
-   Nexthops can be fully resolved or an unresolved.
+   Nexthops can be fully resolved or unresolved.
 
    A resolved nexthop has an adequate level of information to send the
    outgoing packet towards the destination by forwarding it on an
    interface to a directly connected neighbor.
 
    An unresolved nexthop is something that requires the RIB manager to
    determine the final resolved nexthop.  In one example, a nexthop
    could be an IP address.  The RIB manager would resolve how to reach
    that IP address, e.g. by checking if that particular IP address is
    reachable by regular IP forwarding or by a MPLS tunnel or by both.
@@ -1518,21 +1518,21 @@
         nexthops and download them, as for how to select
         the nexthops is left to the implementations.";
    }
 
    typedef nexthop-lb-weight-definition {
      type uint8 {
        range "1..99";
      }
      description
        "Nexthop-lb-weight is used for load-balancing.
-        Each list member MUST be assigned a weight
+        Each list member SHOULD be assigned a weight
         between 1 and 99. The weight determines the
         proportion of traffic to be sent over a nexthop
         used for forwarding as a ratio of the weight of
         this nexthop divided by the sum of the weights
         of all the nexthops of this route that are used
         for forwarding.To perform equal load-balancing,
         one MAY specify a weight of 0 for all the member
         nexthops.  The value 0 is reserved for equal
         load-balancing and if applied, MUST be applied
         to all member nexthops.
@@ -2151,21 +2151,21 @@
          uses ipv6-header;
        }
      }
      leaf virtual-subnet-id {
        type uint32;
        mandatory true;
        description
          "The subnet identifier of the NvGRE header.";
      }
      leaf flow-id {
-       type uint16;
+       type uint8;
        description
          "The flow identifier of the NvGRE header.";
      }
    }
 
    grouping vxlan-header {
      description
        "The VXLAN encapsulation header information.";
      choice vxlan-type {
        description