diff --git a/src/Auth.php b/src/Auth.php
index 147c0a3..315f62f 100644
--- a/src/Auth.php
+++ b/src/Auth.php
@@ -1,9 +1,32 @@
 <?php
 
+/**
+ * Auth Abstraction
+ *
+ * Licensed under The MIT License
+ * Redistribution of these files must retain the above copyright notice.
+ *
+ * @copyright Copyright 2007-2014, Josh Sherman
+ * @license   http://www.opensource.org/licenses/mit-license.html
+ * @link      http://picklesphp.com
+ * @package   Pickles
+ */
+
 namespace Pickles;
 
+/**
+ * Auth Abstract Class
+ */
 abstract class Auth extends Object
 {
+    /**
+     * Basic Auth
+     *
+     * Implement this method when using 'basic' auth. Allows you to roll a
+     * custom solution based on your needs. Want to use username and password?
+     * Rather use an API key and not worry about the password? Do it. Return
+     * true when authentication is successful and false when it is not.
+     */
     public function basic()
     {
 
diff --git a/src/Browser.php b/src/Browser.php
index d19d3c8..18f46ae 100644
--- a/src/Browser.php
+++ b/src/Browser.php
@@ -3,16 +3,13 @@
 /**
  * Browser Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Cache.php b/src/Cache.php
index 28a862b..ecb1fe6 100644
--- a/src/Cache.php
+++ b/src/Cache.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Caching System for PICKLES
- *
- * PHP version 5
+ * Caching System
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -26,7 +23,7 @@ namespace Pickles;
  * don't entirely remember specifics, but the reason for not using Memcached()
  * was due to an unexplainable bug in the version in the repository for Ubuntu
  * 10.04 LTS. Memcached() does support more of the memcached protocol and will
- * eventually be what PICKLES uses. Keys are forced to be uppercase for
+ * eventually be what Pickles uses. Keys are forced to be uppercase for
  * consistencies sake as I've been burned by the case sensitivity due to typos
  * in my code.
  *
diff --git a/src/Config.php b/src/Config.php
index 0d3f226..c32d87b 100644
--- a/src/Config.php
+++ b/src/Config.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Configuration Class File for PICKLES
- *
- * PHP version 5
+ * Configuration
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -23,7 +20,7 @@ namespace Pickles;
  * Handles loading the site's configuration file (if available). At the moment
  * this class is a very skewed Singleton. The plan is to eventually extend this
  * out to support multiple configuration files, and the ability to load in
- * custom config files on the fly as well. The core of PICKLES uses the class
+ * custom config files on the fly as well. The core of Pickles uses the class
  * as a Singleton so we're not loading the configuration multiple times per
  * page load.
  */
diff --git a/src/Convert.php b/src/Convert.php
index e46d22a..87e3c81 100644
--- a/src/Convert.php
+++ b/src/Convert.php
@@ -3,16 +3,13 @@
 /**
  * Converter
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Database.php b/src/Database.php
index 9985df4..24f269c 100644
--- a/src/Database.php
+++ b/src/Database.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Database Class File for PICKLES
- *
- * PHP version 5
+ * Database Abstraction Layer
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  * @todo      Drop driver, hardcode drivers based on the type
  * @todo      More assumptions for the datasource variables
  */
diff --git a/src/Date.php b/src/Date.php
index d38c75a..75af657 100644
--- a/src/Date.php
+++ b/src/Date.php
@@ -3,16 +3,13 @@
 /**
  * Date Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Distance.php b/src/Distance.php
index 3c65b7e..11ff121 100644
--- a/src/Distance.php
+++ b/src/Distance.php
@@ -3,16 +3,13 @@
 /**
  * Distance
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/File.php b/src/File.php
index e04c596..4399b19 100644
--- a/src/File.php
+++ b/src/File.php
@@ -3,16 +3,13 @@
 /**
  * File Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Model.php b/src/Model.php
index f001893..83e4adb 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Model Parent Class for PICKLES
- *
- * PHP version 5
+ * Model Parent Class
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -20,9 +17,9 @@ namespace Pickles;
 /**
  * Model Class
  *
- * This is a parent class that all PICKLES data models should be extending. When
- * using the class as designed, objects will function as active record pattern
- * objects.
+ * This is a parent class that all Pickles data models should be extending.
+ * When using the class as designed, objects will function as active record
+ * pattern objects.
  */
 class Model extends Object
 {
diff --git a/src/Number.php b/src/Number.php
index 5b7bc8f..59c9929 100644
--- a/src/Number.php
+++ b/src/Number.php
@@ -3,16 +3,13 @@
 /**
  * Number Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Object.php b/src/Object.php
index e9b9956..2ca484d 100644
--- a/src/Object.php
+++ b/src/Object.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Object Class File for PICKLES
- *
- * PHP version 5
+ * Parent Object
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -20,7 +17,7 @@ namespace Pickles;
 /**
  * Object Class
  *
- * Every instantiated class in PICKLES should be extending this class. By doing
+ * Every instantiated class in Pickles should be extending this class. By doing
  * so the class is automatically hooked into the profiler, and the object will
  * have access to some common components as well.
  */
diff --git a/src/Profiler.php b/src/Profiler.php
index 3277fe2..184c8d4 100644
--- a/src/Profiler.php
+++ b/src/Profiler.php
@@ -3,16 +3,13 @@
 /**
  * Profiler
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Resource.php b/src/Resource.php
index 0539031..20beea3 100644
--- a/src/Resource.php
+++ b/src/Resource.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Resource Class File for PICKLES
- *
- * PHP version 5
+ * Resource Class
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -20,7 +17,7 @@ namespace Pickles;
 /**
  * Resource Class
  *
- * This is a parent class that all PICKLES modules should be extending. Each
+ * This is a parent class that all Pickles modules should be extending. Each
  * module can specify it's own meta data and whether or not a user must be
  * properly authenticated to view the page. Currently any pages without a
  * template are treated as pages being requested via AJAX and the return will
diff --git a/src/Router.php b/src/Router.php
index 7630857..018e28d 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -1,18 +1,15 @@
 <?php
 
 /**
- * Single Entry Router
- *
- * PHP version 5
+ * Endpoint Router
  *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
@@ -20,7 +17,7 @@ namespace Pickles;
 /**
  * Router Class
  *
- * The heavy lifter of PICKLES, makes the calls to get the session and
+ * The heavy lifter of Pickles, makes the calls to get the session and
  * configuration loaded.  Loads modules, serves up user authentication when the
  * module asks for it, and loads the viewer that the module requested. Default
  * values are present to make things easier on the user.
diff --git a/src/Sort.php b/src/Sort.php
index 92b9417..5c2a4d9 100644
--- a/src/Sort.php
+++ b/src/Sort.php
@@ -3,16 +3,13 @@
 /**
  * Sorting Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/String.php b/src/String.php
index 62ca630..518b308 100644
--- a/src/String.php
+++ b/src/String.php
@@ -3,16 +3,13 @@
 /**
  * String Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;
diff --git a/src/Time.php b/src/Time.php
index af7e4e7..a1a0bb9 100644
--- a/src/Time.php
+++ b/src/Time.php
@@ -3,16 +3,13 @@
 /**
  * Time Utility Collection
  *
- * PHP version 5
- *
  * Licensed under The MIT License
  * Redistribution of these files must retain the above copyright notice.
  *
- * @author    Josh Sherman <josh@gravityblvd.com>
  * @copyright Copyright 2007-2014, Josh Sherman
  * @license   http://www.opensource.org/licenses/mit-license.html
- * @package   PICKLES
- * @link      https://github.com/joshtronic/pickles
+ * @link      http://picklesphp.com
+ * @package   Pickles
  */
 
 namespace Pickles;