diff --git a/draft-ymbk-idr-l3nd.xml b/draft-ymbk-idr-l3nd.xml
index 5d0a3b4..98f8ccf 100644
--- a/draft-ymbk-idr-l3nd.xml
+++ b/draft-ymbk-idr-l3nd.xml
@@ -390,7 +390,7 @@
   <section anchor="hello" title="HELLO">
 
 <!--
-    protocol "Version = 0:8,PDU Type = 0:8,Payload Length = 24:32,Flags:8,Port:16"
+    protocol "Version = 0:8,PDU Type = 0:8,Payload Length = 3:32,Flags:8,Port:16"
 -->
 
     <figure>
@@ -398,7 +398,7 @@
  0                   1                   2                   3  
  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|  Version = 0  |  PDU Type = 0 |      Payload Length = 24      ~
+|  Version = 0  |  PDU Type = 0 |      Payload Length = 3       ~
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 ~                               |     Flags     |      Port     ~
 +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -562,11 +562,11 @@ Flags (bit):
     <t>The Payload Length is the number of octets in all fields of the
     PDU from the Nonce through the Serial Number.</t>
 
-    <t>The Nonce enables detection of a duplicate OPEN PDU.  It SHOULD
-    be either a random number or a high resolution timestamp.  It is
-    needed to prevent session closure due to a repeated OPEN caused by a
-    race or a dropped or delayed ACK.  It can be used to resume a
-    dropped logical session.</t>
+    <t>The four octet Nonce enables detection of a duplicate OPEN PDU.
+    It SHOULD be either a random number or a high resolution timestamp.
+    It is needed to prevent session closure due to a repeated OPEN
+    caused by a race or a dropped or delayed ACK.  It can be used to
+    resume a dropped logical session.</t>
 
     <t>AttrCount is the number of attributes in the Attribute List.  A
     node may send zero or more attributes.</t>
@@ -609,7 +609,7 @@ Flags (bit):
     of zero.</t>
 
     <t>If a sender of OPEN does not receive an ACK of the OPEN PDU in a
-    configurable time (default 30 seconds), then they SHOULD close or
+    configurable time (default 5 seconds), then they SHOULD close or
     otherwise terminate the TLS/TCP session and restart from the HELLO
     state.</t>
 
@@ -685,9 +685,9 @@ Flags (bit):
 <?rfc subcompact="no"?>
         </list></t>
 
-    <t>The Error Codes, noting protocol failures, are listed in <xref
-    target="iana-error"/>.  Someone stuck in the 1990s might think the
-    catenation of EType and Error Code as an echo of 0x1zzz, 0x2zzz,
+    <t>The 12 bit Error Code, noting protocol failures, are listed in
+    <xref target="iana-error"/>.  Someone stuck in the 1990s might think
+    the catenation of EType and Error Code as an echo of 0x1zzz, 0x2zzz,
     etc.  They might be right; or not.</t>
 
     <t>The Error Hint, an arbitrary 16 bits, is any additional data the
@@ -698,7 +698,7 @@ Flags (bit):
 
       <t>If a PDU sender expects an ACK, e.g. for an OPEN, an
       Encapsulation, a Vendor PDU, etc., and does not receive the ACK
-      for a configurable time (default three seconds) the TLS/TCP
+      for a configurable time (default five seconds) the TLS/TCP
       session should be closed or dropped, and both sides revert to
       HELLO state.</t>
 
@@ -792,7 +792,7 @@ Flags (bit):
       target="ack"/>.</t>
 
       <t>If the Sender does not receive an ACK in a configurable
-      interval (default three seconds), they SHOULD retransmit.  After a
+      interval (default five seconds), they SHOULD retransmit.  After a
       user configurable number of failures (default three), the L3ND
       session should be considered dead and the HELLO process
       SHOULD be restarted.</t>
@@ -801,6 +801,12 @@ Flags (bit):
       retried if data have not changed in the interim and the TLS/TCP
       session is still alive.</t>
 
+      <t>Should an Encapsulation in the Encapsulation List be
+      syntactically invalid, e.g. an out of bounds prefix length, the
+      entire Encapsulation PDU MUST be dropped and the sending party
+      notified by an ACK PDU with an EType of 1 and an Error Code of 3,
+      Encapsulation Error.</t>
+
       </section>
     
    <section anchor="eflags" title="Encapsulaion Flags">
@@ -828,7 +834,7 @@ Flags (bit):
       encapsulation which already exists SHOULD raise an
       Announce/Withdraw Error (see <xref target="iana-error"/>); the EType
       SHOULD be 2, suggesting a session restart (see <xref
-      target="ack"/> so all encapsulations will be resent.</t>
+      target="ack"/>) so all encapsulations will be resent.</t>
 
       <t>If an interface on a link has multiple addresses for an
       encapsulation type, one and only one address MAY be marked as
@@ -949,6 +955,9 @@ Flags (bit):
       <t>A Label Count of zero is an implicit withdraw of all labels for
       that prefix on that interface.</t>
 
+      <t>The bottom of the stack flag, S, MUST be set on one and only
+      one label.</t>
+
       </section>
 
     <section anchor="mpls4" title="MPLS IPv4 Encapsulation">
@@ -1265,7 +1274,7 @@ Flags (bit):
             0     No Error
             1     Checksum Error
             2     Logical Link Addressing Conflict
-            3     reserved
+            3     Encapsulation Error
             4     Announce/Withdraw Error
              </artwork>
            </figure>