diff --git a/MANIFEST.in b/MANIFEST.in
index 239115f..3235fd0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2,4 +2,3 @@ include COPYING
 include src/pcp2pdf.bash
 include src/pcp2pdf.conf
 include src/pcplogo.png
-include man/pcp2pdf.1
diff --git a/PKG-INFO b/PKG-INFO
index 4ee2597..652992a 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -2,7 +2,7 @@ Metadata-Version: 1.0
 Name: pcp2pdf
 Version: 0.1
 Summary: Convert PCP archive files to pdf
-Home-page: https://github.com/mbaldessari/pcp2pdf
+Home-page: https://github.com/performancecopilot/pcp2pdf
 Author: Michele Baldessari
 Author-email: michele@xxxxxxxxxx
 License: GPLv2
diff --git a/README.md b/README.md
index 77d36c8..30fed7b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-This document is meant to give an introduction to `pcp2pdf`
+This document gives an introduction to `pcp2pdf`
 
 What is pcp2pdf for?
 ====================
@@ -8,13 +8,22 @@ The main goal of pcp2pdf is to create a visually pleasing report of a
 contain a bunch of metrics of a system and are usually created by the
 pmlogger service, which is part of `Performance Co-Pilot`.
 
+Prerequisites
+=============
+
+pcp2pdf is a python program and makes use of these 3rd party modules:
+
+-   [matplotlib](http://matplotlib.org/users/installing.html)
+-   [reportlab](http://www.reportlab.com/opensource/)
+
 Installation
 ============
+
 If you're using Fedora, you can use the packages found [here](http://acksyn.org/files/rpms/pcp2pdf/).
 Otherwise just use the following:
 
     ./setup.py install
-    pcp2pdf <arguments>
+    pcp2pdf --help
 
 Usage examples
 ==============
@@ -58,4 +67,4 @@ Bugs
 ====
 
 Feel free to report any issues
-[here](https://github.com/mbaldessari/pcp2pdf/issues)
+[here](https://github.com/performancecopilot/pcp2pdf/issues)
diff --git a/docs/pcp2pdf.rst b/docs/pcp2pdf.rst
index 3169f93..c9754a8 100644
--- a/docs/pcp2pdf.rst
+++ b/docs/pcp2pdf.rst
@@ -106,6 +106,6 @@ See also
 Homepage
 --------
 
-`Homepage <http://github.com/mbaldessari/pcp2pdf>`
-`Reporting issues <http://github.com/mbaldessari/pcp2pdf/issues>`
+`Homepage <http://github.com/performancecopilot/pcp2pdf`
+`Reporting issues <http://github.com/performancecopilot/pcp2pdf/issues>`
 
diff --git a/setup.py b/setup.py
index de7437b..40774a8 100755
--- a/setup.py
+++ b/setup.py
@@ -65,7 +65,7 @@ config = {
     'version': '0.1',
     'author': 'Michele Baldessari',
     'author_email': 'michele@xxxxxxxxxx',
-    'url': 'https://github.com/mbaldessari/pcp2pdf',
+    'url': 'https://github.com/performancecopilot/pcp2pdf',
     'license': 'GPLv2',
     'package_dir': {'': 'src'},
     'packages': ['pcp2pdf'],
diff --git a/src/pcp2pdf.egg-info/PKG-INFO b/src/pcp2pdf.egg-info/PKG-INFO
index 849d961..68f472c 100644
--- a/src/pcp2pdf.egg-info/PKG-INFO
+++ b/src/pcp2pdf.egg-info/PKG-INFO
@@ -2,7 +2,7 @@ Metadata-Version: 1.1
 Name: pcp2pdf
 Version: 0.1
 Summary: UNKNOWN
-Home-page: https://github.com/mbaldessari/pcp2pdf
+Home-page: https://github.com/performancecopilot/pcp2pdf
 Author: Michele Baldessari
 Author-email: michele@xxxxxxxxxx
 License: GPLv2
diff --git a/src/pcp2pdf.egg-info/SOURCES.txt b/src/pcp2pdf.egg-info/SOURCES.txt
index 5f5e95f..8452978 100644
--- a/src/pcp2pdf.egg-info/SOURCES.txt
+++ b/src/pcp2pdf.egg-info/SOURCES.txt
@@ -2,7 +2,6 @@ COPYING
 MANIFEST.in
 setup.cfg
 setup.py
-man/pcp2pdf.1
 src/pcp2pdf.bash
 src/pcp2pdf.conf
 src/pcplogo.png
diff --git a/src/pcp2pdf/archive.py b/src/pcp2pdf/archive.py
index b90b987..faba266 100644
--- a/src/pcp2pdf/archive.py
+++ b/src/pcp2pdf/archive.py
@@ -172,7 +172,6 @@ class PcpArchive(object):
         # indom_map is just used as an optimization. The keys are (numpmid,
         # numinst) and the value is the indom name. This avoids too many
         # expensive calls to pmNameInDomArchive.
-        # FIXME: is this guaranteed to never brake?
         indom_map = {}
         metrics = self.get_metrics()
         pmids = self.get_pmids(metrics)
@@ -209,7 +208,7 @@ class PcpArchive(object):
                 if metric not in data:
                     data[metric] = {}
                 count = result.contents.get_numval(i)
-                if count == 0:  # No instance whatsover
+                if count == 0:  # No instance whatsoever
                     continue
                 elif count == 1:  # No indoms are present
                     try:
diff --git a/src/pcp2pdf/stats.py b/src/pcp2pdf/stats.py
index 5dbc0a7..d7ce691 100644
--- a/src/pcp2pdf/stats.py
+++ b/src/pcp2pdf/stats.py
@@ -99,7 +99,7 @@ def split_chunks(list_to_split, chunksize):
     return ret
 
 
-def graph_wrapper((pcparch_obj, data)):
+def graph_wrapper(pcparch_obj, data):
     """Wrapper due to pool.map() single argument limit."""
     (label, fname, metrics, text, indomres, histogram) = data
     if histogram: