diff --git a/bacnet-stack/src/bacapp.c b/bacnet-stack/src/bacapp.c
index 7a3ac2cb..24fe33af 100644
--- a/bacnet-stack/src/bacapp.c
+++ b/bacnet-stack/src/bacapp.c
@@ -673,6 +673,15 @@ BACNET_APPLICATION_TAG bacapp_context_tag_type(
                 case 0:        /* Device Object ID */
                     tag = BACNET_APPLICATION_TAG_OBJECT_ID;
                     break;
+                case 1:
+                    /* 2015.08.22 EKH 135-2012 pg 708
+                    todo - Context 1 in Recipient list would be a BACnetAddress, not coded yet...
+                    BACnetRecipient::= CHOICE { 
+                         device  [0] BACnetObjectIdentifier, 
+                         address  [1] BACnetAddress 
+                          }
+                          */
+                    break;
                 default:
                     break;
             }
diff --git a/bacnet-stack/src/npdu.c b/bacnet-stack/src/npdu.c
index b42c3b2d..ad513182 100644
--- a/bacnet-stack/src/npdu.c
+++ b/bacnet-stack/src/npdu.c
@@ -385,7 +385,7 @@ int npdu_decode(
         /* Bit 3: Source specifier where: */
         /* 0 =  SNET, SLEN, and SADR absent */
         /* 1 =  SNET, SLEN, and SADR present */
-        /* SLEN = 0 Invalid */
+        /* SLEN = 0 Invalid todo Steve: immediately below src->len == broadcast case, surely then this comment is incorrect? */
         /* SLEN > 0 specifies length of SADR field */
         if (npdu[1] & BIT3) {
             len += decode_unsigned16(&npdu[len], &src_net);