diff --git a/doc/conf.py b/doc/conf.py
index 2cf6e3967a1..7b84f6f7f73 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -113,7 +113,7 @@ def __getattr__(cls, name):
 
 # General information about the project.
 project = u'xray'
-copyright = u'2014, Stephan Hoyer, Alex Kleeman, Eugene Brevdo'
+copyright = u'2014, xray Developers'
 
 import xray
 
@@ -268,7 +268,7 @@ def __getattr__(cls, name):
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
   ('index', 'xray.tex', u'xray Documentation',
-   u'Stephan Hoyer and Alex Kleeman', 'manual'),
+   u'xray Developers', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -298,7 +298,7 @@ def __getattr__(cls, name):
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'xray', u'xray Documentation',
-     [u'Stephan Hoyer and Alex Kleeman'], 1)
+     [u'xray Developers'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -312,7 +312,7 @@ def __getattr__(cls, name):
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'xray', u'xray Documentation',
-   u'Stephan Hoyer and Alex Kleeman', 'xray', 'One line description of project.',
+   u'xray Developers', 'xray', 'One line description of project.',
    'Miscellaneous'),
 ]
 
@@ -330,4 +330,5 @@ def __getattr__(cls, name):
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'http://docs.python.org/': None}
+intersphinx_mapping = {}
+intersphinx_mapping['pandas'] = ('http://pandas.pydata.org/pandas-docs/stable/', None)
diff --git a/setup.py b/setup.py
index 4db4aa1360b..06a742d8389 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,7 @@
 
 DISTNAME = 'xray'
 LICENSE = 'Apache'
-AUTHOR = 'Stephan Hoyer, Alex Kleeman, Eugene Brevdo'
+AUTHOR = 'xray Developers'
 AUTHOR_EMAIL = 'xray-discussion@googlegroups.com'
 URL = 'https://github.com/xray/xray'
 CLASSIFIERS = [
@@ -26,7 +26,10 @@
     'License :: OSI Approved :: Apache Software License',
     'Operating System :: OS Independent',
     'Intended Audience :: Science/Research',
+    'Programming Language :: Python',
+    'Programming Language :: Python :: 2',
     'Programming Language :: Python :: 2.7',
+    'Programming Language :: Python :: 3',
     'Programming Language :: Python :: 3.3',
     'Topic :: Scientific/Engineering',
 ]