diff --git a/LICENSE b/LICENSE
index 8d7df9b9..61c26ad6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
-Copyright (c) 1998-2002 John Aycock
-Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
 Copyright (c) 2015 by Rocky Bernstein
+Copyright (c) 2000 by hartmut Goebel <h.goebel@crazy-compilers.com>
+Copyright (c) 1998-2002 John Aycock
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/PKG-INFO b/PKG-INFO
index 25fb4faf..e2448e0a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -5,6 +5,6 @@ Summary: Python byte-code to source-code converter
 Home-page: http://github.com/rocky/python-uncompyle6
 Author: Rocky
 Author-email: rb@dustyfeet.com
-License: GPLv3
+License: MIT
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/__pkginfo__.py b/__pkginfo__.py
index ab009c51..fb11cac3 100644
--- a/__pkginfo__.py
+++ b/__pkginfo__.py
@@ -32,7 +32,7 @@ author             = "Rocky Bernstein, Hartmut Goebel, John Aycock, and others"
 author_email       = "rb@dustyfeet.com"
 entry_points={
     'console_scripts': [
-        'uncompyle6=uncompyle6.bin.uncompile:main_bin',
+        'uncompyle6=uncompyle6.bin:main_bin',
         'pydisassemble=uncompyle6.bin.pydisassemble:main',
     ]}
 ftp_url            = None
diff --git a/test/simple_source/README b/test/simple_source/README
index 40bce7c4..a6e6ded5 100644
--- a/test/simple_source/README
+++ b/test/simple_source/README
@@ -1,12 +1,9 @@
-Files in this directory contain very simnple constructs that work
-across all versions of Python.
+Files in this directory contain very simple constructs.
+Some of these don't work across across all versions of Python.
 
 Their simplicity is to try to make it easier to debug scanner, grammar
 and semantic-action routines.
 
-We also try to make the code here runnable by Python and when run should
-not produce an error.
-
 The numbers in the filenames are to assist running the programs from
 the simplest to more complex. For example, many tests have assignment
 statements or function calls, so we want to test those constructs
diff --git a/uncompyle6/scanners/scanner33.py b/uncompyle6/scanners/scanner33.py
index 616d1f2a..e46ad2b7 100644
--- a/uncompyle6/scanners/scanner33.py
+++ b/uncompyle6/scanners/scanner33.py
@@ -1,10 +1,9 @@
 #  Copyright (c) 2015-2016 by Rocky Bernstein
 """
-Python 3 bytecode scanner/deparser
+Python 3.3 bytecode scanner/deparser
 
-This overlaps Python's 3.3's dis module, but it can be run from
-Python 2 and other versions of Python. Also, we save token information
-for later use in deparsing.
+This sets up opcodes Python's 3.3 and calls a generalized
+scanner routine for Python 3.
 """
 
 from __future__ import print_function
diff --git a/uncompyle6/scanners/scanner34.py b/uncompyle6/scanners/scanner34.py
index 404a9e04..81ea1498 100644
--- a/uncompyle6/scanners/scanner34.py
+++ b/uncompyle6/scanners/scanner34.py
@@ -30,7 +30,7 @@ if __name__ == "__main__":
     if PYTHON_VERSION >= 3.2:
         import inspect
         co = inspect.currentframe().f_code
-        tokens, customize = Scanner34(3.4).disassemble(co)
+        tokens, customize = Scanner34().disassemble(co)
         for t in tokens:
             print(t)
         pass
diff --git a/uncompyle6/scanners/scanner35.py b/uncompyle6/scanners/scanner35.py
index b3ab1c09..fafa8ef9 100644
--- a/uncompyle6/scanners/scanner35.py
+++ b/uncompyle6/scanners/scanner35.py
@@ -29,10 +29,10 @@ if __name__ == "__main__":
     if PYTHON_VERSION == 3.5:
         import inspect
         co = inspect.currentframe().f_code
-        tokens, customize = Scanner35(3.5).disassemble(co)
+        tokens, customize = Scanner35().disassemble(co)
         for t in tokens:
             print(t.format())
         pass
     else:
-        print("Need to be Python 3.5to demo; I am %s." %
+        print("Need to be Python 3.5 to demo; I am %s." %
               PYTHON_VERSION)