--- openflow-2014-12-11.h	2015-07-23 09:54:18.064479399 -0700
+++ openflow-2014-12-11-2.h	2015-07-23 09:54:18.068479400 -0700
@@ -160,11 +160,11 @@
     OFPT_REQUESTFORWARD     = 32, /* Async message */
 
     /* Bundle operations (multiple messages as a single operation). */
-    OFPT_BUNDLE_CONTROL     = 33,
-    OFPT_BUNDLE_ADD_MESSAGE = 34,
+    OFPT_BUNDLE_CONTROL     = 33, /* Controller/switch message */
+    OFPT_BUNDLE_ADD_MESSAGE = 34, /* Controller/switch message */
 
     /* Controller Status async message. */
-    OFPT_CONTROLLER_STATUS  = 35,
+    OFPT_CONTROLLER_STATUS  = 35, /* Async message */
 
 };
 
@@ -2350,7 +2350,7 @@
   OFPBFC_SCHED_PAST = 18,     /* Scheduled commit time exceeds lower bound. */
 };
 
-/* OFPT_ERROR: Error message (datapath -> controller). */
+/* OFPT_ERROR: Error message. */
 struct ofp_error_msg {
     struct ofp_header header;
 
@@ -2737,7 +2737,7 @@
     uint16_t         type;    /* OFPTFPT_PACKET_TYPES. */
     uint16_t         length;  /* Length in bytes of this property. */
     /* Followed by:
-     *   - Exactly (length - 4) bytes containing the oxm_ids, then
+     *   - Exactly (length - 4) bytes containing the oxm values, then
      *   - Exactly (length + 7)/8*8 - (length) (between 0 and 7)
      *     bytes of all-zero bytes */
     uint32_t         oxm_values[0];   /* Array of OXM values */
@@ -3616,7 +3616,9 @@
                                  OFPACPT_FLOW_REMOVED_*,
                                  OFPACPT_ROLE_STATUS_*,
                                  OFPACPT_TABLE_STATUS_*,
-                                 OFPACPT_REQUESTFORWARD_*. */
+                                 OFPACPT_REQUESTFORWARD_*,
+                                 OFPACPT_FLOW_STATS_*,
+                                 OFPACPT_CONT_STATUS_*. */
     uint16_t         length;  /* Length in bytes of this property. */
     uint32_t         mask;    /* Bitmasks of reason values. */
 };