diff --git a/lib/spack/spack/packages/graphlib.py b/lib/spack/spack/packages/graphlib.py
index 4f1e610441..c959135147 100644
--- a/lib/spack/spack/packages/graphlib.py
+++ b/lib/spack/spack/packages/graphlib.py
@@ -1,33 +1,14 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install v
-#
-# You can always get back here to change things with:
-#
-#     spack edit v
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Graphlib(Package):
     """Library to create, manipulate, and export graphs Graphlib."""
-    # FIXME: add a proper url for your package's homepage here.
-    homepage = "http://www.example.com"
+    homepage = "http://https://github.com/lee218llnl/graphlib"
     url      = "https://github.com/lee218llnl/graphlib/archive/v2.0.0.tar.gz"
 
     versions = { '2.0.0' : '43c6df84f1d38ba5a5dce0ae19371a70', }
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         cmake(".", *std_cmake_args)
 
-        # FIXME: Add logic to build and install here
         make()
         make("install")
diff --git a/lib/spack/spack/packages/mrnet.py b/lib/spack/spack/packages/mrnet.py
index e7218be0d4..0fcbe68ee3 100644
--- a/lib/spack/spack/packages/mrnet.py
+++ b/lib/spack/spack/packages/mrnet.py
@@ -1,19 +1,3 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install mrnet
-#
-# You can always get back here to change things with:
-#
-#     spack edit mrnet
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Mrnet(Package):
@@ -24,9 +8,7 @@ class Mrnet(Package):
     versions = { '4.0.0' : 'd00301c078cba57ef68613be32ceea2f', }
 
     def install(self, spec, prefix):
-        # FIXME: Modify the configure line to suit your build system here.
         configure("--prefix=%s" %prefix, "--enable-shared")
 
-        # FIXME: Add logic to build and install here
         make(parallel=False)
         make("install", parallel=False)
diff --git a/lib/spack/spack/packages/stat.py b/lib/spack/spack/packages/stat.py
index c49c04275c..8d9d9f406a 100644
--- a/lib/spack/spack/packages/stat.py
+++ b/lib/spack/spack/packages/stat.py
@@ -1,25 +1,8 @@
-# FIXME:
-# This is a template package file for Spack.  We've conveniently
-# put "FIXME" labels next to all the things you'll want to change.
-#
-# Once you've edited all the FIXME's, delete this whole message,
-# save this file, and test out your package like this:
-#
-#     spack install v
-#
-# You can always get back here to change things with:
-#
-#     spack edit v
-#
-# See the spack documentation for more information on building
-# packages.
-#
 from spack import *
 
 class Stat(Package):
     """Library to create, manipulate, and export graphs Graphlib."""
-    # FIXME: add a proper url for your package's homepage here.
-    homepage = "http://www.example.com"
+    homepage = "http://paradyn.org/STAT/STAT.html"
     url      = "https://github.com/lee218llnl/stat/archive/v2.0.0.tar.gz"
 
     versions = { '2.0.0' : 'c7494210b0ba26b577171b92838e1a9b', }
@@ -37,7 +20,6 @@ def install(self, spec, prefix):
         my_dyninst = spec['dyninst']
         my_libdwarf = spec['libdwarf']
 
-        # FIXME: Modify the configure line to suit your build system here.
         # TODO: this uses the launchmon package, but path is too long (see depends_on above) (Jira SPACK-21)
         #configure("--enable-gui", "--prefix=%s" %prefix, "--with-launchmon=%s" %my_launchmon.prefix, "--with-mrnet=%s" %my_mrnet.prefix, "--with-graphlib=%s" %my_graphlib.prefix, "--with-stackwalker=%s" %my_dyninst.prefix, "--with-libdwarf=%s" %my_libdwarf.prefix)
 
@@ -48,6 +30,5 @@ def install(self, spec, prefix):
         import shutil
         shutil.copy2('/usr/bin/libtool', 'libtool')
     
-        # FIXME: Add logic to build and install here
         make(parallel=False)
         make("install")