diff --git a/inc/qcbor/qcbor_encode.h b/inc/qcbor/qcbor_encode.h
index d676211..f7f8142 100644
--- a/inc/qcbor/qcbor_encode.h
+++ b/inc/qcbor/qcbor_encode.h
@@ -784,7 +784,7 @@
   @param[in] nDays            Number of days before or after 1970-01-0.
 
  This date format is described in
- [RFC 8943] (https://tools.ietf.org/html/rfc3339).
+ [RFC 8943] (https://tools.ietf.org/html/rfc8943).
 
  The integer encoding rules apply here so the date will be encoded in
  a minimal number of bytes. Until about the year 2149 these dates will
@@ -1475,7 +1475,7 @@
  @param[in] szDate           Null-terminated string with date to add.
 
  This date format is described in
- [RFC 8943] (https://tools.ietf.org/html/rfc3339), but that mainly
+ [RFC 8943] (https://tools.ietf.org/html/rfc8943), but that mainly
  references RFC 3339.  The string szDate must be in the forrm
  specified the ABNF for a full-date in
  [RFC 3339] (https://tools.ietf.org/html/rfc3339). Examples of this
diff --git a/inc/qcbor/qcbor_spiffy_decode.h b/inc/qcbor/qcbor_spiffy_decode.h
index b45dc55..325d876 100644
--- a/inc/qcbor/qcbor_spiffy_decode.h
+++ b/inc/qcbor/qcbor_spiffy_decode.h
@@ -991,7 +991,7 @@
 
  @param[in] pCtx             The decode context.
  @param[in] uTagRequirement  One of @c QCBOR_TAG_REQUIREMENT_XXX.
- @param[out] pDateString            The decoded date.
+ @param[out] pDateString     The decoded date.
 
  This decodes the standard CBOR date/time string tag, integer tag
  number of 0, or encoded CBOR that is not a tag, but borrows the
@@ -1024,7 +1024,7 @@
 
  @param[in] pCtx             The decode context.
  @param[in] uTagRequirement  One of @c QCBOR_TAG_REQUIREMENT_XXX.
- @param[out] pDateString            The decoded date.
+ @param[out] pDateString     The decoded date.
 
  This decodes the  CBOR date-onlystring tag, integer tag
  number of 1004, or encoded CBOR that is not a tag, but borrows the
@@ -1101,7 +1101,7 @@
 
  @param[in] pCtx             The decode context.
  @param[in] uTagRequirement  One of @c QCBOR_TAG_REQUIREMENT_XXX.
- @param[out] pnDays            The decoded epoch date.
+ @param[out] pnDays          The decoded epoch date.
 
  This decodes the CBOR epoch date tag, integer tag number of 100, or
  encoded CBOR that is not a tag, but borrows the content format. The
diff --git a/src/qcbor_decode.c b/src/qcbor_decode.c
index 382e13d..3f15d4a 100644
--- a/src/qcbor_decode.c
+++ b/src/qcbor_decode.c
@@ -3880,7 +3880,7 @@
 
 
 /*
- * Common processing for the RFC 8943 Day-count tag. Mostly
+ * Common processing for the RFC 8943 day-count tag. Mostly
  * make sure the tag content is correct and copy forward any
  * further other tag numbers.
  */
diff --git a/test/qcbor_decode_tests.c b/test/qcbor_decode_tests.c
index f594a5b..779b094 100644
--- a/test/qcbor_decode_tests.c
+++ b/test/qcbor_decode_tests.c
@@ -2616,25 +2616,23 @@
    0x09,
    0xF9, 0xC0, 0x00,
 
+   /* Tagged date-only date string */
+   0x63, 0x53, 0x44, 0x53,
+   0xD9, 0x03, 0xEC,
+   0x6A, 0x31, 0x39, 0x38, 0x35, 0x2D, 0x30, 0x34, 0x2D, 0x31, 0x32, /* "1985-04-12" */
 
-   0x63,                  //       # text(3)
-      0x53, 0x44, 0x53, //                  # "SDS"
-   0xD9, 0x03, 0xEC, //                    # tag(1004)
-      0x6A, //                      # text(10)
-     0x31, 0x39, 0x38, 0x35, 0x2D, 0x30, 0x34, 0x2D, 0x31, 0x32, // # "1985-04-12"
+   /* Untagged date-only date string */
+   0x18, 0x63,
+   0x6A, 0x31, 0x39, 0x38, 0x35, 0x2D, 0x30, 0x34, 0x2D, 0x31, 0x32, /* "1985-04-12" */
 
-   0x18, 0x63,                      //# unsigned(99)
-   0x6A,                        // # text(10)
-     0x31, 0x39, 0x38, 0x35, 0x2D, 0x30, 0x34, 0x2D, 0x31, 0x32, //    # "1985-04-12"
+   /* Tagged days-count epoch date */
+   0x63, 0x53, 0x44, 0x45,
+   0xD8, 0x64,  /* tag(100) */
+   0x39, 0x29, 0xB3, /* -10676 */
 
-
-   0x63,                         //# text(3)
-      0x53, 0x44, 0x45,            //      # "SDE"
-   0xD8, 0x64,                     // # tag(100)
-      0x39, 0x29, 0xB3,              //   # negative(10675)
-
-   0x11,                        // # unsigned(8)
-   0x19, 0x0F, 0x9A               //     # unsigned(3994)
+   /* Untagged days-count epoch date */
+   0x11,
+   0x19, 0x0F, 0x9A /* 3994 */
 
 };