diff --git a/wxPython/demo/About.py b/wxPython/demo/About.py
index c76e8639fb..3e22739553 100644
--- a/wxPython/demo/About.py
+++ b/wxPython/demo/About.py
@@ -51,7 +51,7 @@ demo item so you can learn how to use the classes yourself.</p>
         btn = html.FindWindowById(wxID_OK)
         btn.SetDefault()
         ir = html.GetInternalRepresentation()
-        html.SetSize( (ir.GetWidth()+5, ir.GetHeight()+5) )
+        html.SetSize( (ir.GetWidth()+25, ir.GetHeight()+25) )
         self.SetClientSize(html.GetSize())
         self.CentreOnParent(wxBOTH)
 
diff --git a/wxPython/demo/GridSimple.py b/wxPython/demo/GridSimple.py
index 33e6153c28..6dae441690 100644
--- a/wxPython/demo/GridSimple.py
+++ b/wxPython/demo/GridSimple.py
@@ -13,7 +13,7 @@ class SimpleGrid(wxGrid): ##, wxGridAutoEditMixin):
 
         EVT_IDLE(self, self.OnIdle)
 
-        self.CreateGrid(25, 25)
+        self.CreateGrid(25, 25) #, wxGrid.wxGridSelectRows)
         ##self.EnableEditing(false)
 
         # simple cell formatting
diff --git a/wxPython/demo/Main.py b/wxPython/demo/Main.py
index 233160bc15..25aaabfeea 100644
--- a/wxPython/demo/Main.py
+++ b/wxPython/demo/Main.py
@@ -29,7 +29,7 @@ _treeList = [
         'wxPyColourChooser',
         ]),
 
-    # managed windows == things with a caption you can close
+    # managed windows == things with a (optional) caption you can close
     ('Base Frames and Dialogs', [
         'wxDialog',
         'wxFrame',
@@ -298,9 +298,10 @@ class wxPythonDemo(wxFrame):
         findID = wxNewId()
         findnextID = wxNewId()
         menu = wxMenu()
-        menu.Append(helpID, '&About\tCtrl-H', 'wxPython RULES!!!')
         menu.Append(findID, '&Find\tCtrl-F', 'Find in the Demo Code')
         menu.Append(findnextID, 'Find &Next\tF3', 'Find Next')
+        menu.AppendSeparator()
+        menu.Append(helpID, '&About\tCtrl-H', 'wxPython RULES!!!')
         EVT_MENU(self, helpID, self.OnHelpAbout)
         EVT_MENU(self, findID, self.OnHelpFind)
         EVT_MENU(self, findnextID, self.OnFindNext)
diff --git a/wxPython/demo/wxFileDialog.py b/wxPython/demo/wxFileDialog.py
index 559f7e3d0d..a73dc06970 100644
--- a/wxPython/demo/wxFileDialog.py
+++ b/wxPython/demo/wxFileDialog.py
@@ -10,8 +10,10 @@ wildcard = "Python source (*.py)|*.py|" \
 def runTest(frame, nb, log):
     dlg = wxFileDialog(frame, "Choose a file", "", "", wildcard, wxOPEN|wxMULTIPLE)
     if dlg.ShowModal() == wxID_OK:
-        for path in dlg.GetPaths():
-            log.WriteText('You selected: %s\n' % path)
+        paths = dlg.GetPaths()
+        log.WriteText('You selected %d files:' % len(paths))
+        for path in paths:
+            log.WriteText('           %s\n' % path)
     dlg.Destroy()
 
 #---------------------------------------------------------------------------
diff --git a/wxPython/demo/wxListCtrl.py b/wxPython/demo/wxListCtrl.py
index 5dd69f6c5c..cf101ff08d 100644
--- a/wxPython/demo/wxListCtrl.py
+++ b/wxPython/demo/wxListCtrl.py
@@ -97,7 +97,10 @@ class TestListCtrlPanel(wxPanel, wxColumnSorterMixin):
         self.sm_dn = self.il.Add(images.getSmallDnArrowBitmap())
 
         self.list = TestListCtrl(self, tID,
-                               style=wxLC_REPORT|wxSUNKEN_BORDER)#|wxLC_VRULES|wxLC_HRULES)
+                                 style=wxLC_REPORT | wxSUNKEN_BORDER
+                                 #| wxLC_NO_HEADER
+                                 #| wxLC_VRULES | wxLC_HRULES
+                                 )
         self.list.SetImageList(self.il, wxIMAGE_LIST_SMALL)
 
         self.PopulateList()
diff --git a/wxPython/demo/wxToolBar.py b/wxPython/demo/wxToolBar.py
index ee6cdfb3c0..76c527aa1b 100644
--- a/wxPython/demo/wxToolBar.py
+++ b/wxPython/demo/wxToolBar.py
@@ -23,8 +23,8 @@ class TestToolBar(wxFrame):
 
         self.CreateStatusBar()
 
-        #tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
-        tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
+        tb.AddSimpleTool(10, images.getNewBitmap(), "New", "Long help for 'New'")
+        #tb.AddLabelTool(10, "New", images.getNewBitmap(), shortHelp="New", longHelp="Long help for 'New'")
         EVT_TOOL(self, 10, self.OnToolClick)
         EVT_TOOL_RCLICKED(self, 10, self.OnToolRClick)
 
@@ -47,9 +47,9 @@ class TestToolBar(wxFrame):
                                shortHelp="Toggle this")
         EVT_TOOL(self, 50, self.OnToolClick)
 
-        #tb.AddCheckTool(60, '', images.getTog1Bitmap(), images.getTog2Bitmap(),
-        #                shortHelp="Toggle with 2 bitmaps")
-        #EVT_TOOL(self, 60, self.OnToolClick)
+##         tb.AddCheckTool(60, images.getTog1Bitmap(), images.getTog2Bitmap(),
+##                         shortHelp="Toggle with 2 bitmaps")
+##         EVT_TOOL(self, 60, self.OnToolClick)
 
         EVT_TOOL_ENTER(self, -1, self.OnToolEnter)
         EVT_TOOL_RCLICKED(self, -1, self.OnToolRClick)  # Match all
@@ -110,16 +110,15 @@ def runTest(frame, nb, log):
 
 
 
-
-
-
-
-
-
-
-
-
-
 overview = """\
 
 """
+
+
+
+
+if __name__ == '__main__':
+    import sys,os
+    import run
+    run.main(['', os.path.basename(sys.argv[0])])
+