diff --git a/aksetup_helper.py b/aksetup_helper.py
index 3f09d3365bf425e4a824e1d4a3473a2aea02ce7e..3a3771b76aa348d6028bbc8c93b39bd63401e90b 100644
--- a/aksetup_helper.py
+++ b/aksetup_helper.py
@@ -15,9 +15,9 @@ def setup(*args, **kwargs):
     except SystemExit:
         raise
     except:
-        print "--------------------------------------------------------------------------"
-        print "Sorry, your build failed. Try rerunning configure with different options."
-        print "--------------------------------------------------------------------------"
+        print "----------------------------------------------------------------------------"
+        print "Sorry, your build failed. Try rerunning configure.py with different options."
+        print "----------------------------------------------------------------------------"
         raise
 
 
@@ -110,20 +110,20 @@ def get_config(schema=None):
         schema = get_config_schema()
 
     if not schema.have_config() and not schema.have_global_config():
-        print "********************************************************"
-        print "*** I have detected that you have not run configure."
-        print "********************************************************"
+        print "*************************************************************"
+        print "*** I have detected that you have not run configure.py."
+        print "*************************************************************"
         print "*** Additionally, no global config files were found."
         print "*** I will go ahead with the default configuration."
         print "*** In all likelihood, this will not work out."
         print "*** "
         print "*** See README_SETUP.txt for more information."
         print "*** "
-        print "*** If the build does fail, just re-run configure with the"
+        print "*** If the build does fail, just re-run configure.py with the"
         print "*** correct arguments, and then retry. Good luck!"
-        print "********************************************************"
+        print "*************************************************************"
         print "*** HIT Ctrl-C NOW IF THIS IS NOT WHAT YOU WANT"
-        print "********************************************************"
+        print "*************************************************************"
 
         delay = 10
 
diff --git a/setup.py b/setup.py
index 1967108533350fd52ff1f63b325e1abacc4af396..00c7ec8ad25b1b65d5ab4f816d80fc56e6934b23 100644
--- a/setup.py
+++ b/setup.py
@@ -86,8 +86,11 @@ def main():
             * Helpful and complete `Documentation <http://documen.tician.de/pyopencl>`_
               as well as a `Wiki <http://wiki.tiker.net/PyOpenCL>`_.
 
-            * Liberal license. PyOpenCL is open-source and 
+            * Liberal license. PyOpenCL is open-source under the MIT license and 
               free for commercial, academic, and private use.
+
+            * Broad support. PyOpenCL was tested and works with both AMD's and Nvidia's 
+              CL implementations.
             """,
             author=u"Andreas Kloeckner",
             author_email="inform@tiker.net",
@@ -95,7 +98,7 @@ def main():
             url="http://mathema.tician.de/software/pyopencl",
             classifiers=[
               'Environment :: Console',
-              'Development Status :: 2 - Pre-Alpha',
+              'Development Status :: 4 - Beta',
               'Intended Audience :: Developers',
               'Intended Audience :: Other Audience',
               'Intended Audience :: Science/Research',