diff --git a/doc/changelog.txt b/doc/changelog.txt
index a676daa5a..2e45a3f2b 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,6 +1,8 @@
 Changes between 1.0.x and 'trunk'
 =====================================
 
+* merge Jarko's fixes, issue #45 and #46
+
 * add the ability to specify a path for py.lookup to search in
 
 * fix a funcarg cached_setup bug probably only occuring 
diff --git a/doc/test/quickstart.txt b/doc/test/quickstart.txt
index 4efb9864b..6ef4f4572 100644
--- a/doc/test/quickstart.txt
+++ b/doc/test/quickstart.txt
@@ -23,7 +23,7 @@ Now create a file ``test_sample.py`` with the following content:
     def func(x):
         return x + 1
     def test_answer():
-        assert f(3) == 5
+        assert func(3) == 5
 
 You can now run the test file like this::
 
diff --git a/py/bin/env.py b/py/bin/env.py
index bb0e08550..09c6c7de3 100644
--- a/py/bin/env.py
+++ b/py/bin/env.py
@@ -3,7 +3,7 @@
 import sys, os, os.path
 
 progpath = sys.argv[0]
-packagedir = os.path.abspath(os.path.dirname(progpath))
+packagedir = os.path.dirname(os.path.dirname(os.path.abspath(progpath)))
 packagename = os.path.basename(packagedir)
 bindir = os.path.join(packagedir, 'bin')
 if sys.platform == 'win32':
diff --git a/py/error.py b/py/error.py
index 870f82395..2f1d9e3a0 100644
--- a/py/error.py
+++ b/py/error.py
@@ -74,7 +74,7 @@ class ErrorMaker(object):
                 cls = self._geterrnoclass(errno)
             else: 
                 try: 
-                    cls = self._geterrnoclass(_winerrnomap[eno]) 
+                    cls = self._geterrnoclass(_winerrnomap[errno]) 
                 except KeyError:    
                     raise value 
             raise cls("%s%r" % (func.__name__, args))