diff --git a/src/groveultrasonic/groveultrasonic.hpp b/src/groveultrasonic/groveultrasonic.hpp
index d1fd3405..f571984e 100644
--- a/src/groveultrasonic/groveultrasonic.hpp
+++ b/src/groveultrasonic/groveultrasonic.hpp
@@ -38,7 +38,7 @@ namespace upm {
 /**
  * @brief Grove ultrasonic sensor library
  * @defgroup groveultrasonic libupm-groveultrasonic
- * @ingroup grove gpio sound
+ * @ingroup seeed gpio sound
  */
 
 /**
diff --git a/src/mg811/mg811.hpp b/src/mg811/mg811.hpp
index d8c4934d..7ded89d4 100644
--- a/src/mg811/mg811.hpp
+++ b/src/mg811/mg811.hpp
@@ -32,7 +32,7 @@ namespace upm {
   /**
    * @brief DFRobot CO2 Sensor
    * @defgroup mg811 libupm-mg811
-   * @ingroup dfrobot analog gas
+   * @ingroup dfrobot analog gaseous
    */
 
   /**
@@ -40,7 +40,7 @@ namespace upm {
    * @sensor mg811
    * @comname DFRobot CO2 Sensor
    * @altname MG811
-   * @type gas
+   * @type gaseous
    * @man dfrobot
    * @web http://www.dfrobot.com/index.php?route=product/product&product_id=1023
    * @con analog
diff --git a/src/t6713/t6713.cxx b/src/t6713/t6713.cxx
index c2c91262..1a46cebc 100644
--- a/src/t6713/t6713.cxx
+++ b/src/t6713/t6713.cxx
@@ -1,5 +1,5 @@
 /*
- * Author: HCL
+ * Author: Henry Bruce <henry.bruce@intel.com>
  * Copyright (c) 2015 Intel Corporation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/t6713/t6713.hpp b/src/t6713/t6713.hpp
index 06a973bd..6c9c50af 100644
--- a/src/t6713/t6713.hpp
+++ b/src/t6713/t6713.hpp
@@ -1,5 +1,5 @@
 /*
- * Author: HCL
+ * Author: Henry Bruce <henry.bruce@intel.com>
  * Copyright (c) 2015 Intel Corporation.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
@@ -31,16 +31,10 @@ namespace upm {
 /**
  * @brief Amphenol Telaire 6713 Series CO2 Module
  * @defgroup t6713 libupm-t6713
- * @ingroup i2c telaire gas ico2sensor
+ * @ingroup i2c amphenol gaseous ico2sensor
  */
 
 /**
- * @brief C++ API for Amphenol Telaire 6713 Series CO2 Module
- *
- * The Telaire 6713 Series CO2 Module
- * [6713](http://amphenol-sensors.com/en/products/co2/co2-modules/3215-t6700#specifications-t6713)
- * is a CO2 Module sensor.
- *
  * @library t6713
  * @sensor t6713
  * @comname Telaire 6713 Series CO2 Module
@@ -48,8 +42,16 @@ namespace upm {
  * @type gaseous
  * @man amphenol
  * @con i2c
- * @if ic02sensor
-
+ * @if ico2sensor
+ *
+ * @brief C++ API for Amphenol Telaire 6713 Series CO2 Module
+ *
+ * The Telaire 6713 Series CO2 Module
+ * [6713](http://amphenol-sensors.com/en/products/co2/co2-modules/3215-t6700#specifications-t6713)
+ * is a CO2 Module sensor.
+ *
+ * @snippet t6713.cxx Interesting
+ * @snippet co2-sensor.cxx Interesting
  */
 namespace t6713_co2
 {
diff --git a/src/upm.h b/src/upm.h
index e287c828..6b97fbdf 100644
--- a/src/upm.h
+++ b/src/upm.h
@@ -269,7 +269,7 @@
 
  /**
  * @brief Implements ICOSensor
- * @defgroup ic02sensor ICOSensor
+ * @defgroup ico2sensor ICOSensor
  * @ingroup byif
  */