diff --git a/docs/changes.txt b/docs/changes.txt
index 4c12a6e990..4ce1d0e3b3 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,6 +1,27 @@
 wxWindows 2 Change Log
 ----------------------
 
+2.1.16
+------
+
+wxBase:
+
+All (GUI):
+
+wxMSW:
+
+- Various bug fixes
+- Added wxCHMHelpController, for invoking MS HTML Help
+  files. This works under VC++ only
+
+wxGTK:
+
+- Various bug fixes
+
+wxMotif:
+
+- Various bug fixes
+
 2.1.15
 ------
 
diff --git a/docs/msw/install.txt b/docs/msw/install.txt
index 881d598f8f..28836c1387 100644
--- a/docs/msw/install.txt
+++ b/docs/msw/install.txt
@@ -456,7 +456,8 @@ Here are the steps required:
 - Edit wx/src/makeg95.env and set the MINGW32 variable at the top of
   the file to either 1 (you have Mingw32) or 0 (you have Cygwin32).
   If using MINGW32, also set the MINGW32VERSION variable
-  appropriately.
+  appropriately. Note: Cygwin 1.1.0 and above may
+  need MINGW32 set to 1 to compile properly.
 
 - Set your WXWIN variable to where wxWindows is installed.
   *** IMPORTANT: For Cygwin/Mingw32, use forward slashes in the path, not
diff --git a/include/wx/defs.h b/include/wx/defs.h
index afc63ea65a..1eeb5d50ef 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -399,6 +399,10 @@ typedef int wxWindowID;
 #    define WXDLLEXPORT_DATA(type) type
 #    define WXDLLEXPORT_CTORFN
 #  endif
+#else
+#    define WXDLLEXPORT
+#    define WXDLLEXPORT_DATA(type) type
+#    define WXDLLEXPORT_CTORFN
 #endif
 
 #elif defined(__WXPM__)
diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 9ef7d550b3..0480dfe640 100644
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -702,7 +702,7 @@ bool wxDbTable::Open(void)
                 return(pDb->DispAllErrors(henv, hdbc, hstmtInsert));
         }
 		  else 
-            insertable= false;
+            insertable= FALSE;
     }
     
     // Completed successfully
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
index 6290f69c0a..78c1a4bd2d 100644
--- a/src/msw/glcanvas.cpp
+++ b/src/msw/glcanvas.cpp
@@ -179,7 +179,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent,
     m_glContext = new wxGLContext(TRUE, this, palette, shared );
 }
 
-// Not very usefull for wxMSW, but this is to be wxGTK compliant
+// Not very useful for wxMSW, but this is to be wxGTK compliant
 
 wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id,
                         const wxPoint& pos, const wxSize& size, long style, const wxString& name,
@@ -218,6 +218,17 @@ wxGLCanvas::~wxGLCanvas()
 bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id,
               const wxPoint& pos, const wxSize& size, long style, const wxString& name)
 {
+/* Suggestion from Kelly Brock <kbrock@8cs.com> (not yet implemented):
+
+OpenGL corruption fix is simple assuming it doesn't screw anything else
+up.  Add the following line to the top of the create function:
+        wxSize parentSize = GetClientSize();
+        All locations within the function that use 'size' are changed to
+'parentSize'.
+        The above corrects the initial display corruption with the GeForce and
+TNT2, not sure about other NVidia cards yet.
+*/
+
     static bool registeredGLCanvasClass = FALSE;
 
     // We have to register a special window class because we need
@@ -282,9 +293,17 @@ bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id,
     if ( style & wxTHICK_FRAME )
         msflags |= WS_THICKFRAME;
 
-    msflags |= WS_CHILD | WS_VISIBLE;
-    if ( style & wxCLIP_CHILDREN )
-        msflags |= WS_CLIPCHILDREN;
+/*
+        A general rule with OpenGL and Win32 is that any window that will have a
+        HGLRC built for it must have two flags:  WS_CLIPCHILDREN & WS_CLIPSIBLINGS.
+        You can find references about this within the knowledge base and most OpenGL
+        books that contain the wgl function descriptions.
+*/
+
+    msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS;
+//    if ( style & wxCLIP_CHILDREN )
+//        msflags |= WS_CLIPCHILDREN;
+    msflags |= WS_CLIPCHILDREN;
 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D);