diff --git a/direct/src/directscripts/Sources.pp b/direct/src/directscripts/Sources.pp
index d40a6d275b..28bff5f41b 100644
--- a/direct/src/directscripts/Sources.pp
+++ b/direct/src/directscripts/Sources.pp
@@ -1,3 +1,3 @@
 // For now, since these scripts are not installed anywhere, this file can
 // remain empty.
-
+#define INSTALL_SCRIPTS runPythonEmacs
diff --git a/direct/src/directscripts/python-mode.el b/direct/src/directscripts/python-mode.el
index 5b73ddbfb3..0a432f3876 100644
--- a/direct/src/directscripts/python-mode.el
+++ b/direct/src/directscripts/python-mode.el
@@ -3142,4 +3142,3 @@ These are Python temporary files awaiting execution."
 (provide 'python-mode)
 ;;; python-mode.el ends here
 
------
diff --git a/direct/src/directscripts/runPythonEmacs b/direct/src/directscripts/runPythonEmacs
index 54bdb00bb5..7777fa972e 100755
--- a/direct/src/directscripts/runPythonEmacs
+++ b/direct/src/directscripts/runPythonEmacs
@@ -1,7 +1,5 @@
 #! /bin/sh
 
-### NOTE: YOU MUST UPDATE THE PATHS TO YOUR HOME DIRECTORY AND EMACS BELOW
-
 # Under Windows/Cygwin, we have to de-cygwinify the semicolon 
 # separated PYTHONPATH
 
@@ -38,15 +36,14 @@ if [ "$TOONTOWN" ]; then
 fi
 
 # Export the proper home environment variable
-HOME="C:\Cygwin\usr\YOUR_HOME_DIR_HERE"
+HOME=`cygpath -w $HOME`
 export HOME
 
 # Now start up emacs
-# UPDATE THE PATH TO YOUR COPY OF EMACS HERE
 if [ "$1" != "" ]; then
-    exec "C:\Program Files\emacs-20.7\bin\runemacs" $1
+    exec runemacs $1
 else
-    exec "C:\Program Files\emacs-20.7\bin\runemacs"
+    exec runemacs
 fi
 
 
diff --git a/direct/src/showbase/Task.py b/direct/src/showbase/Task.py
index 605ca1762c..c1e6bfe4bc 100644
--- a/direct/src/showbase/Task.py
+++ b/direct/src/showbase/Task.py
@@ -272,10 +272,10 @@ from ShowBaseGlobal import * # to get taskMgr, and run()
 
 # sequence
 
-def seq1(self):
+def seq1(state):
     print 'seq1'
     return Task.done
-def seq2(self):
+def seq2(state):
     print 'seq2'
     return Task.done
 
@@ -286,13 +286,13 @@ run()
 
 # timeline
 
-def keyframe1(self):
+def keyframe1(state):
     print 'keyframe1'
     return Task.done
-def keyframe2(self):
+def keyframe2(state):
     print 'keyframe2'
     return Task.done
-def keyframe3(self):
+def keyframe3(state):
     print 'keyframe3'
     return Task.done
     
@@ -307,7 +307,7 @@ run()
 
 # do later - returns a sequence
 
-def foo(self):
+def foo(state):
     print 'later...'
     return Task.done
 
@@ -319,12 +319,12 @@ run()
 
 someValue = 1
 
-def func(self):
-    if (self.someValue > 10):
+def func(state):
+    if (state.someValue > 10):
         print 'true!'
         return Task.done
     else:
-        self.someValue = self.someValue + 1
+        state.someValue = state.someValue + 1
         return Task.cont
 
 task = Task.Task(func)