diff --git a/Documentation/NxWidgets.html b/Documentation/NxWidgets.html
index 2d88d2bf486..69344dc918c 100644
--- a/Documentation/NxWidgets.html
+++ b/Documentation/NxWidgets.html
@@ -8,11 +8,11 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NxWidgets</i></font></big></h1>
-      <p>Last Updated: March 27, 2012</p>
+      <p>Last Updated: November 7, 2017</p>
     </td>
   </tr>
 </table>
-<h1>NXWidgets</h1>
+<h1>NxWidgets</h1>
 <p>
   In order to better support NuttX based platforms, a special graphical userinterface has been created called NXWidgets.
   NXWidgets is written in C++ and integrates seamlessly with the NuttX <a href="NXGraphicsSubsystem.html">NX graphics subsystem</a> in order to provide graphic objects, or &quot;widgets,&quot; in the NX Graphics Subsystem
@@ -61,10 +61,10 @@
 </p>
 <ul>
   <li>
-    <b>NxWidgets-1.15</b>:
-    <a href="http://nuttx.org/nxwidgets_v1_15/index.html">Documentation</a>,
-    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.15/">Release notes</a>, and
-    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.15/">Downloads</a>
+    <b>NxWidgets-1.18</b>:
+    <a href="http://nuttx.org/nxwidgets_v1_18/index.html">Documentation</a>,
+    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.18/">Release notes</a>, and
+    <a href="http://sourceforge.net/projects/nuttx/files/NxWidgets/NxWidgets-1.18/">Downloads</a>
   </li>
 </p>
 <p>
diff --git a/arch/arm/src/stm32/stm32f33xxx_adc.c b/arch/arm/src/stm32/stm32f33xxx_adc.c
index 6b7ae5306ab..91314b63e2f 100644
--- a/arch/arm/src/stm32/stm32f33xxx_adc.c
+++ b/arch/arm/src/stm32/stm32f33xxx_adc.c
@@ -2279,7 +2279,7 @@ errout:
 struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
                                       int channels)
 {
-  FAR struct adc_dev_s   *dev;
+  FAR struct adc_dev_s *dev;
   FAR struct stm32_dev_s *priv;
   uint8_t cr_channels = 0;
   uint8_t cj_channels = 0;
@@ -2328,7 +2328,7 @@ struct adc_dev_s *stm32_adcinitialize(int intf, FAR const uint8_t *chanlist,
   memcpy(priv->r_chanlist, chanlist, cr_channels);
 
 #ifdef ADC_HAVE_INJECTED
-  /* Configur injected channels */
+  /* Configure injected channels */
 
   DEBUGASSERT(cj_channels <= ADC_INJ_MAX_SAMPLES);