diff --git a/direct/src/doc/pandaUserGuide.doc b/direct/src/doc/pandaUserGuide.doc
index ae7a7e4e49..83af0b5b37 100644
Binary files a/direct/src/doc/pandaUserGuide.doc and b/direct/src/doc/pandaUserGuide.doc differ
diff --git a/direct/src/ffi/FFIOverload.py b/direct/src/ffi/FFIOverload.py
index bacd2fb334..989db63d9a 100644
--- a/direct/src/ffi/FFIOverload.py
+++ b/direct/src/ffi/FFIOverload.py
@@ -219,6 +219,7 @@ class FFIMethodArgumentTreeCollection:
         else:
             indent(file, nesting+1, 'def ' +
                    self.methodSpecList[0].name + '(self, *_args):\n')
+        self.methodSpecList[0].outputCFunctionComment(file, nesting+2)
         indent(file, nesting+2, 'numArgs = len(_args)\n')
         
     def outputOverloadedMethodFooter(self, file, nesting):
@@ -251,7 +252,7 @@ class FFIMethodArgumentTreeCollection:
             tree = FFIMethodArgumentTree(self.classTypeDesc, methodList)
             treeList = ifAbsentPut(self.treeDict, numArgs, [])
             treeList.append(tree)
-        
+
     def generateCode(self, file, nesting):
         self.setup()
         self.outputOverloadedMethodHeader(file, nesting)
diff --git a/direct/src/ffi/FFISpecs.py b/direct/src/ffi/FFISpecs.py
index 8b429e6fe2..2502a4a55e 100644
--- a/direct/src/ffi/FFISpecs.py
+++ b/direct/src/ffi/FFISpecs.py
@@ -89,7 +89,7 @@ class FunctionSpecification:
         So "getChild(int)" becomes "overloaded_getChild_int(int)"
         """
         if self.overloaded:
-            name = 'overloaded_' + self.name
+            name = '__overloaded_' + self.name
             for methodArgSpec in self.typeDescriptor.argumentTypes:
                 name = name + '_' + methodArgSpec.typeDescriptor.foreignTypeName
             return name
diff --git a/direct/src/gui/DirectGui.py b/direct/src/gui/DirectGui.py
index 4a7eb721e2..848fedc8b5 100644
--- a/direct/src/gui/DirectGui.py
+++ b/direct/src/gui/DirectGui.py
@@ -1,4 +1,7 @@
 from DirectGuiGlobals import *
+from OnscreenText import *
+from OnscreenGeom import *
+from OnscreenImage import *
 
 # Set up default font
 PGItem.getTextNode().setFont(getDefaultFont())
diff --git a/direct/src/gui/DirectGuiBase.py b/direct/src/gui/DirectGuiBase.py
index f4aec3f09a..30508896b2 100644
--- a/direct/src/gui/DirectGuiBase.py
+++ b/direct/src/gui/DirectGuiBase.py
@@ -1,4 +1,7 @@
 from DirectGuiGlobals import *
+from OnscreenText import *
+from OnscreenGeom import *
+from OnscreenImage import *
 from DirectUtil import ROUND_TO
 import PandaObject
 import Task
diff --git a/direct/src/gui/DirectGuiGlobals.py b/direct/src/gui/DirectGuiGlobals.py
index db43634474..5166b3371b 100644
--- a/direct/src/gui/DirectGuiGlobals.py
+++ b/direct/src/gui/DirectGuiGlobals.py
@@ -68,6 +68,7 @@ MIDGROUND_SORT_INDEX = 0
 FOREGROUND_SORT_INDEX = 100
 
 defaultFont = None
+defaultFontName = "models/fonts/Comic"
 defaultClickSound = None
 defaultRolloverSound = None
 defaultDialogGeom = None
@@ -97,13 +98,17 @@ def setDefaultClickSound(newSound):
 def getDefaultFont():
     global defaultFont
     if defaultFont == None:
-        defaultFont = loader.loadFont("models/fonts/Comic")
+        defaultFont = loader.loadFont(defaultFontName)
     return defaultFont
 
 def setDefaultFont(newFont):
     global defaultFont
     defaultFont = newFont
 
+def setDefaultFontName(newFontName):
+    global defaultFontName
+    defaultFontName = newFontName
+
 def getDefaultDialogGeom():
     global defaultDialogGeom
     if defaultDialogGeom == None:
@@ -128,6 +133,6 @@ def setDefaultPanel(newPanel):
     global panel
     panel = newPanel
 
-from OnscreenText import *
-from OnscreenGeom import *
-from OnscreenImage import *
+#from OnscreenText import *
+#from OnscreenGeom import *
+#from OnscreenImage import *
diff --git a/direct/src/task/Task.py b/direct/src/task/Task.py
index bc4f5aed5f..241ef51734 100644
--- a/direct/src/task/Task.py
+++ b/direct/src/task/Task.py
@@ -547,3 +547,4 @@ class TaskManager:
         # you must manually tick the clock        
         # Ask for the time last frame
         return globalClock.getFrameTime(), globalClock.getFrameCount()
+