Clean up git object docblocks
Clean up git object docblocks

--- a/include/git/Archive.class.php
+++ b/include/git/Archive.class.php
@@ -1,122 +1,92 @@
 <?php
 /**
- * GitPHP Archive
- *
- * Represents an archive (snapshot)
+ * Generates an archive (snapshot)
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2010 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Archive class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Archive
 {
 	/**
-	 * objectType
-	 *
-	 * Stores the object type for this archive
-	 *
-	 * @access protected
+	 * The object type for this archive
+	 *
+	 * @var string
 	 */
 	protected $objectType;
 
 	/**
-	 * objectHash
-	 *
-	 * Stores the object hash for this archive
-	 *
-	 * @access protected
+	 * The object hash for this archive
+	 *
+	 * @var string
 	 */
 	protected $objectHash;
 
 	/**
-	 * project
-	 *
-	 * Stores the project for this archive internally
-	 *
-	 * @access protected
+	 * The project for this archive
+	 *
+	 * @var GitPHP_Project|string
 	 */
 	protected $project;
 
 	/**
-	 * format
-	 *
-	 * Stores the archive format internally
-	 *
-	 * @access protected
+	 * The archive format
+	 *
+	 * @var string
 	 */
 	protected $format;
 
 	/**
-	 * fileName
-	 *
-	 * Stores the archive filename internally
-	 *
-	 * @access protected
+	 * The archive filename
+	 *
+	 * @var string
 	 */
 	protected $fileName = '';
 
 	/**
-	 * path
-	 *
-	 * Stores the archive path internally
-	 *
-	 * @access protected
+	 * The archive path
+	 *
+	 * @var string
 	 */
 	protected $path = '';
 
 	/**
-	 * prefix
-	 *
-	 * Stores the archive prefix internally
-	 *
-	 * @access protected
+	 * The archive prefix
+	 *
+	 * @var string
 	 */
 	protected $prefix = '';
 
 	/**
-	 * compressLevel
-	 *
 	 * Stores the compression level
 	 *
-	 * @access protected
+	 * @var int
 	 */
 	protected $compressLevel;
 
 	/**
-	 * handle
-	 *
 	 * Stores the process handle
 	 *
-	 * @access protected
+	 * @var resource
 	 */
 	protected $handle = false;
 
 	/**
-	 * tempfile
-	 *
 	 * Stores the temp file name
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $tempfile = '';
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $gitObject the object
-	 * @param integer $format the format for the archive
-	 * @return mixed git archive
+	 * @param GitPHP_Project $project project
+	 * @param GitPHP_Commit|GitPHP_Tree $gitObject the object
+	 * @param string $format the format for the archive
+	 * @param string $path subtree path to archive
+	 * @param string $prefix archive directory prefix
 	 */
 	public function __construct($project, $gitObject, $format = GITPHP_FORMAT_ZIP, $path = '', $prefix = '')
 	{
@@ -131,12 +101,9 @@
 	}
 
 	/**
-	 * GetFormat
-	 *
 	 * Gets the archive format
 	 *
-	 * @access public
-	 * @return integer archive format
+	 * @return string archive format
 	 */
 	public function GetFormat()
 	{
@@ -144,12 +111,9 @@
 	}
 
 	/**
-	 * SetFormat
-	 *
 	 * Sets the archive format
 	 *
-	 * @access public
-	 * @param integer $format archive format
+	 * @param string $format archive format
 	 */
 	public function SetFormat($format)
 	{
@@ -166,12 +130,9 @@
 	}
 
 	/**
-	 * GetObject
-	 *
 	 * Gets the object for this archive
 	 *
-	 * @access public
-	 * @return mixed the git object
+	 * @return GitPHP_Commit|GitPHP_Tree|null the git object
 	 */
 	public function GetObject()
 	{
@@ -187,12 +148,9 @@
 	}
 
 	/**
-	 * SetObject
-	 *
 	 * Sets the object for this archive
 	 *
-	 * @access public
-	 * @param mixed $object the git object
+	 * @param GitPHP_Commit|GitPHP_Tree|null $object the git object
 	 */
 	public function SetObject($object)
 	{
@@ -220,12 +178,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project for this archive
 	 *
-	 * @access public
-	 * @return mixed the project
+	 * @return GitPHP_Project the project
 	 */
 	public function GetProject()
 	{
@@ -233,12 +188,9 @@
 	}
 
 	/**
-	 * SetProject
-	 *
 	 * Sets the project for this archive
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 */
 	public function SetProject($project)
 	{
@@ -246,11 +198,8 @@
 	}
 
 	/**
-	 * GetExtension
-	 *
 	 * Gets the extension to use for this archive
 	 *
-	 * @access public
 	 * @return string extension for the archive
 	 */
 	public function GetExtension()
@@ -259,11 +208,8 @@
 	}
 
 	/**
-	 * GetFilename
-	 *
 	 * Gets the filename for this archive
 	 *
-	 * @access public
 	 * @return string filename
 	 */
 	public function GetFilename()
@@ -288,11 +234,8 @@
 	}
 
 	/**
-	 * SetFilename
-	 *
 	 * Sets the filename for this archive
 	 *
-	 * @access public
 	 * @param string $name filename
 	 */
 	public function SetFilename($name = '')
@@ -301,11 +244,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the path to restrict this archive to
 	 *
-	 * @access public
 	 * @return string path
 	 */
 	public function GetPath()
@@ -314,11 +254,8 @@
 	}
 
 	/**
-	 * SetPath
-	 *
 	 * Sets the path to restrict this archive to
 	 *
-	 * @access public
 	 * @param string $path path to restrict
 	 */
 	public function SetPath($path = '')
@@ -327,11 +264,8 @@
 	}
 
 	/**
-	 * GetPrefix
-	 *
 	 * Gets the directory prefix to use for files in this archive
 	 *
-	 * @access public
 	 * @return string prefix
 	 */
 	public function GetPrefix()
@@ -349,11 +283,8 @@
 	}
 
 	/**
-	 * SetPrefix
-	 *
 	 * Sets the directory prefix to use for files in this archive
 	 *
-	 * @access public
 	 * @param string $prefix prefix to use
 	 */
 	public function SetPrefix($prefix = '')
@@ -371,11 +302,8 @@
 	}
 
 	/**
-	 * GetCompressLevel
-	 *
 	 * Gets the compression level
 	 *
-	 * @access public
 	 * @return int compression level
 	 */
 	public function GetCompressLevel()
@@ -384,12 +312,9 @@
 	}
 
 	/**
-	 * SetCompressLevel
-	 *
 	 * Sets the compression level
 	 *
-	 * @access public
-	 * @param int $compresLevel compression level
+	 * @param int $compressLevel compression level
 	 */
 	public function SetCompressLevel($compressLevel)
 	{
@@ -408,11 +333,8 @@
 	}
 
 	/**
-	 * Open
-	 *
 	 * Opens a descriptor for reading archive data
 	 *
-	 * @access public
 	 * @return boolean true on success
 	 */
 	public function Open()
@@ -477,11 +399,8 @@
 	}
 
 	/**
-	 * Close
-	 *
 	 * Close the archive data descriptor
 	 *
-	 * @access public
 	 * @return boolean true on success
 	 */
 	public function Close()
@@ -506,11 +425,8 @@
 	}
 
 	/**
-	 * Read
-	 *
 	 * Read a chunk of the archive data
 	 *
-	 * @access public
 	 * @param int $size size of data to read
 	 * @return string archive data
 	 */
@@ -537,12 +453,8 @@
 	}
 
 	/**
-	 * FormatToExtension
-	 *
 	 * Gets the extension to use for a particular format
 	 *
-	 * @access public
-	 * @static
 	 * @param string $format format to get extension for
 	 * @return string file extension
 	 */
@@ -565,12 +477,8 @@
 	}
 
 	/**
-	 * SupportedFormats
-	 *
 	 * Gets the supported formats for the archiver
 	 *
-	 * @access public
-	 * @static
 	 * @return array array of formats mapped to extensions
 	 */
 	public static function SupportedFormats()

--- a/include/git/Blob.class.php
+++ b/include/git/Blob.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Blob
- *
  * Represents a single blob
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,62 +7,42 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Commit class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Blob extends GitPHP_FilesystemObject
 {
 
 	/**
-	 * data
-	 *
-	 * Stores the file data
-	 *
-	 * @access protected
+	 * The blob data
+	 *
+	 * @var string
 	 */
 	protected $data;
 
 	/**
-	 * dataRead
-	 *
-	 * Stores whether data has been read
-	 *
-	 * @access protected
+	 * Whether data has been read
+	 *
+	 * @var boolean
 	 */
 	protected $dataRead = false;
 
 	/**
-	 * size
-	 *
-	 * Stores the size
-	 *
-	 * @access protected
+	 * The blob size
+	 *
+	 * @var int
 	 */
 	protected $size = null;
 
 	/**
-	 * dataEncoded
-	 *
-	 * Stores whether data has been encoded for serialization
-	 *
-	 * @access protected
+	 * Whether data has been encoded for serialization
+	 *
+	 * @var boolean
 	 */
 	protected $dataEncoded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash object hash
-	 * @return mixed blob object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -72,13 +50,10 @@
 	}
 
 	/**
-	 * GetData
-	 *
 	 * Gets the blob data
 	 *
-	 * @access public
 	 * @param boolean $explode true to explode data into an array of lines
-	 * @return string blob data
+	 * @return string|string[] blob data
 	 */
 	public function GetData($explode = false)
 	{
@@ -95,11 +70,7 @@
 	}
 
 	/**
-	 * ReadData
-	 *
 	 * Reads the blob data
-	 *
-	 * @access private
 	 */
 	private function ReadData()
 	{
@@ -121,12 +92,8 @@
 	}
 
 	/**
-	 * FileType
-	 *
 	 * Gets a file type from its octal mode
 	 *
-	 * @access public
-	 * @static
 	 * @param string $octMode octal mode
 	 * @param boolean $local true if caller wants localized type
 	 * @return string file type
@@ -162,11 +129,8 @@
 	}
 
 	/**
-	 * GetSize
-	 *
 	 * Gets the blob size
 	 *
-	 * @access public
 	 * @return integer size
 	 */
 	public function GetSize()
@@ -179,11 +143,8 @@
 	}
 
 	/**
-	 * SetSize
-	 *
 	 * Sets the blob size
 	 *
-	 * @access public
 	 * @param integer $size size
 	 */
 	public function SetSize($size)
@@ -192,11 +153,8 @@
 	}
 
 	/**
-	 * IsBinary
-	 *
 	 * Tests if this blob is a binary file
 	 *
-	 * @access public
 	 * @return boolean true if binary file
 	 */
 	public function IsBinary()
@@ -212,11 +170,7 @@
 	}
 
 	/**
-	 * EncodeData
-	 *
 	 * Encodes data so it can be serialized safely
-	 *
-	 * @access private
 	 */
 	private function EncodeData()
 	{
@@ -229,11 +183,7 @@
 	}
 
 	/**
-	 * DecodeData
-	 *
 	 * Decodes data after unserialization
-	 *
-	 * @access private
 	 */
 	private function DecodeData()
 	{
@@ -246,12 +196,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{
@@ -264,11 +211,8 @@
 	}
 
 	/**
-	 * GetCacheKey
-	 *
 	 * Gets the cache key to use for this object
 	 *
-	 * @access public
 	 * @return string cache key
 	 */
 	public function GetCacheKey()
@@ -277,12 +221,8 @@
 	}
 
 	/**
-	 * CacheKey
-	 *
 	 * Generates a blob cache key
 	 *
-	 * @access public
-	 * @static
 	 * @param string $proj project
 	 * @param string $hash hash
 	 * @return string cache key

--- a/include/git/Commit.class.php
+++ b/include/git/Commit.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Commit
- *
  * Represents a single commit
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,152 +7,112 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Commit class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Commit extends GitPHP_GitObject
 {
 
 	/**
-	 * dataRead
-	 *
-	 * Indicates whether data for this commit has been read
-	 *
-	 * @access protected
+	 * Whether data for this commit has been read
+	 *
+	 * @var boolean
 	 */
 	protected $dataRead = false;
 
 	/**
-	 * parents
-	 *
 	 * Array of parent commits
 	 *
-	 * @access protected
+	 * @var string[]
 	 */
 	protected $parents = array();
 
 	/**
-	 * tree
-	 *
 	 * Tree hash for this commit
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $tree;
 
 	/**
-	 * author
-	 *
 	 * Author for this commit
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $author;
 
 	/**
-	 * authorEpoch
-	 *
 	 * Author's epoch
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $authorEpoch;
 
 	/**
-	 * authorTimezone
-	 *
 	 * Author's timezone
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $authorTimezone;
 
 	/**
-	 * committer
-	 *
 	 * Committer for this commit
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $committer;
 
 	/**
-	 * committerEpoch
-	 *
 	 * Committer's epoch
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $committerEpoch;
 
 	/**
-	 * committerTimezone
-	 *
 	 * Committer's timezone
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $committerTimezone;
 
 	/**
-	 * title
-	 *
-	 * Stores the commit title
-	 *
-	 * @access protected
+	 * The commit title
+	 *
+	 * @var string
 	 */
 	protected $title;
 
 	/**
-	 * comment
-	 *
-	 * Stores the commit comment
-	 *
-	 * @access protected
+	 * The commit comment
+	 *
+	 * @var string
 	 */
 	protected $comment = array();
 
 	/**
-	 * readTree
-	 *
-	 * Stores whether tree filenames have been read
-	 *
-	 * @access protected
+	 * Whether tree filenames have been read
+	 *
+	 * @var boolean
 	 */
 	protected $readTree = false;
 
 	/**
-	 * containingTag
-	 *
-	 * Stores the tag containing the changes in this commit
-	 *
-	 * @access protected
+	 * The tag containing the changes in this commit
+	 *
+	 * @var string
 	 */
 	protected $containingTag = null;
 
 	/**
-	 * containingTagRead
-	 *
-	 * Stores whether the containing tag has been looked up
-	 *
-	 * @access public
+	 * Whether the containing tag has been looked up
+	 *
+	 * @var boolean
 	 */
 	protected $containingTagRead = false;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash object hash
-	 * @return mixed git object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -162,11 +120,8 @@
 	}
 
 	/**
-	 * GetHash
-	 *
 	 * Gets the hash for this commit (overrides base)
 	 *
-	 * @access public
 	 * @param boolean $abbreviate true to abbreviate hash
 	 * @return string object hash
 	 */
@@ -182,12 +137,9 @@
 	}
 
 	/**
-	 * GetParent
-	 *
 	 * Gets the main parent of this commit
 	 *
-	 * @access public
-	 * @return mixed commit object for parent
+	 * @return GitPHP_Commit|null commit object for parent
 	 */
 	public function GetParent()
 	{
@@ -202,12 +154,9 @@
 	}
 
 	/**
-	 * GetParents
-	 *
 	 * Gets an array of parent objects for this commit
 	 *
-	 * @access public
-	 * @return mixed array of commit objects
+	 * @return GitPHP_Commit[] array of commit objects
 	 */
 	public function GetParents()
 	{
@@ -223,12 +172,9 @@
 	}
 
 	/**
-	 * GetTree
-	 *
 	 * Gets the tree for this commit
 	 *
-	 * @access public
-	 * @return mixed tree object
+	 * @return GitPHP_Tree tree object
 	 */
 	public function GetTree()
 	{
@@ -248,11 +194,8 @@
 	}
 
 	/**
-	 * GetAuthor
-	 *
 	 * Gets the author for this commit
 	 *
-	 * @access public
 	 * @return string author
 	 */
 	public function GetAuthor()
@@ -264,11 +207,8 @@
 	}
 
 	/**
-	 * GetAuthorName
-	 *
 	 * Gets the author's name only
 	 *
-	 * @access public
 	 * @return string author name
 	 */
 	public function GetAuthorName()
@@ -280,11 +220,8 @@
 	}
 
 	/**
-	 * GetAuthorEpoch
-	 *
 	 * Gets the author's epoch
 	 *
-	 * @access public
 	 * @return string author epoch
 	 */
 	public function GetAuthorEpoch()
@@ -296,11 +233,8 @@
 	}
 
 	/**
-	 * GetAuthorLocalEpoch
-	 *
 	 * Gets the author's local epoch
 	 *
-	 * @access public
 	 * @return string author local epoch
 	 */
 	public function GetAuthorLocalEpoch()
@@ -315,11 +249,8 @@
 	}
 
 	/**
-	 * GetAuthorTimezone
-	 *
 	 * Gets the author's timezone
 	 *
-	 * @access public
 	 * @return string author timezone
 	 */
 	public function GetAuthorTimezone()
@@ -331,11 +262,8 @@
 	}
 
 	/**
-	 * GetCommitter
-	 *
 	 * Gets the author for this commit
 	 *
-	 * @access public
 	 * @return string author
 	 */
 	public function GetCommitter()
@@ -347,11 +275,8 @@
 	}
 
 	/**
-	 * GetCommitterName
-	 *
 	 * Gets the author's name only
 	 *
-	 * @access public
 	 * @return string author name
 	 */
 	public function GetCommitterName()
@@ -363,11 +288,8 @@
 	}
 
 	/**
-	 * GetCommitterEpoch
-	 *
 	 * Gets the committer's epoch
 	 *
-	 * @access public
 	 * @return string committer epoch
 	 */
 	public function GetCommitterEpoch()
@@ -379,11 +301,8 @@
 	}
 
 	/**
-	 * GetCommitterLocalEpoch
-	 *
 	 * Gets the committer's local epoch
 	 *
-	 * @access public
 	 * @return string committer local epoch
 	 */
 	public function GetCommitterLocalEpoch()
@@ -398,11 +317,8 @@
 	}
 
 	/**
-	 * GetCommitterTimezone
-	 *
 	 * Gets the author's timezone
 	 *
-	 * @access public
 	 * @return string author timezone
 	 */
 	public function GetCommitterTimezone()
@@ -414,11 +330,8 @@
 	}
 
 	/**
-	 * GetTitle
-	 *
 	 * Gets the commit title
 	 *
-	 * @access public
 	 * @param integer $trim length to trim to (0 for no trim)
 	 * @return string title
 	 */
@@ -439,12 +352,9 @@
 	}
 
 	/**
-	 * GetComment
-	 *
 	 * Gets the lines of comment
 	 *
-	 * @access public
-	 * @return array lines of comment
+	 * @return string[] lines of comment
 	 */
 	public function GetComment()
 	{
@@ -455,13 +365,10 @@
 	}
 
 	/**
-	 * SearchComment
-	 *
 	 * Gets the lines of the comment matching the given pattern
 	 *
-	 * @access public
 	 * @param string $pattern pattern to find
-	 * @return array matching lines of comment
+	 * @return string[] matching lines of comment
 	 */
 	public function SearchComment($pattern)
 	{
@@ -475,11 +382,8 @@
 	}
 
 	/**
-	 * GetAge
-	 *
 	 * Gets the age of the commit
 	 *
-	 * @access public
 	 * @return string age
 	 */
 	public function GetAge()
@@ -494,11 +398,8 @@
 	}
 
 	/**
-	 * IsMergeCommit
-	 *
 	 * Returns whether this is a merge commit
 	 *
-	 * @access pubilc
 	 * @return boolean true if merge commit
 	 */
 	public function IsMergeCommit()
@@ -510,11 +411,7 @@
 	}
 
 	/**
-	 * ReadData
-	 *
 	 * Read the data for the commit
-	 *
-	 * @access protected
 	 */
 	protected function ReadData()
 	{
@@ -616,12 +513,9 @@
 	}
 
 	/**
-	 * GetHeads
-	 *
 	 * Gets heads that point to this commit
 	 * 
-	 * @access public
-	 * @return array array of heads
+	 * @return GitPHP_Head[] array of heads
 	 */
 	public function GetHeads()
 	{
@@ -639,12 +533,9 @@
 	}
 
 	/**
-	 * GetTags
-	 *
 	 * Gets tags that point to this commit
 	 *
-	 * @access public
-	 * @return array array of tags
+	 * @return GitPHP_Tag[] array of tags
 	 */
 	public function GetTags()
 	{
@@ -664,12 +555,9 @@
 	}
 
 	/**
-	 * GetContainingTag
-	 *
 	 * Gets the tag that contains the changes in this commit
 	 *
-	 * @access public
-	 * @return tag object
+	 * @return GitPHP_Tag tag object
 	 */
 	public function GetContainingTag()
 	{
@@ -683,11 +571,7 @@
 	}
 
 	/**
-	 * ReadContainingTag
-	 *
 	 * Looks up the tag that contains the changes in this commit
-	 *
-	 * @access private
 	 */
 	public function ReadContainingTag()
 	{
@@ -711,12 +595,9 @@
 	}
 
 	/**
-	 * DiffToParent
-	 *
 	 * Diffs this commit with its immediate parent
 	 *
-	 * @access public
-	 * @return mixed Tree diff
+	 * @return GitPHP_TreeDiff Tree diff
 	 */
 	public function DiffToParent()
 	{
@@ -724,12 +605,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{
@@ -738,11 +616,8 @@
 	}
 
 	/**
-	 * GetCacheKey
-	 *
 	 * Gets the cache key to use for this object
 	 *
-	 * @access public
 	 * @return string cache key
 	 */
 	public function GetCacheKey()
@@ -751,14 +626,10 @@
 	}
 
 	/**
-	 * CompareAge
-	 *
 	 * Compares two commits by age
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first commit
-	 * @param mixed $b second commit
+	 * @param GitPHP_Commit $a first commit
+	 * @param GitPHP_Commit $b second commit
 	 * @return integer comparison result
 	 */
 	public static function CompareAge($a, $b)
@@ -771,14 +642,10 @@
 	}
 
 	/**
-	 * CompareAuthorEpoch
-	 *
 	 * Compares two commits by author epoch
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first commit
-	 * @param mixed $b second commit
+	 * @param GitPHP_Commit $a first commit
+	 * @param GitPHP_Commit $b second commit
 	 * @return integer comparison result
 	 */
 	public static function CompareAuthorEpoch($a, $b)
@@ -790,12 +657,8 @@
 	}
 
 	/**
-	 * CacheKey
-	 *
 	 * Generates a commit cache key
 	 *
-	 * @access public
-	 * @static
 	 * @param string $proj project
 	 * @param string $hash hash
 	 * @return string cache key

--- a/include/git/CommitSearch.class.php
+++ b/include/git/CommitSearch.class.php
@@ -1,26 +1,15 @@
 <?php
 /**
- * GitPHP CommitSearch
- *
- * Class to represent a commit log search
+ * Class to perform a commit log search
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2012 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * CommitSearch class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_CommitSearch extends GitPHP_RevList
 {
 	/**
-	 * CommitType
-	 *
 	 * Commit search type
 	 *
 	 * @const
@@ -28,8 +17,6 @@
 	const CommitType = 1;
 
 	/**
-	 * AuthorType
-	 *
 	 * Author search type
 	 *
 	 * @const
@@ -37,8 +24,6 @@
 	const AuthorType = 2;
 
 	/**
-	 * CommitterType
-	 *
 	 * Committer search type
 	 *
 	 * @const
@@ -46,33 +31,26 @@
 	const CommitterType = 3;
 
 	/**
-	 * type
-	 *
 	 * Stores the search type
 	 *
-	 * @access protected
+	 * @var int
 	 */
 	protected $type;
 
 	/**
-	 * search
-	 *
 	 * Stores the search query
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $search;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 * @param int $type search type
 	 * @param string $search search string
-	 * @param mixed $head head to walk back from
+	 * @param GitPHP_Commit $head head to walk back from
 	 * @param int $limit limit of revisions to walk
 	 * @param int $skip number of revisions to skip
 	 */
@@ -93,11 +71,8 @@
 	}
 
 	/**
-	 * GetType
-	 *
 	 * Gets the search type
 	 *
-	 * @access public
 	 * @return int search type
 	 */
 	public function GetType()
@@ -106,11 +81,8 @@
 	}
 
 	/**
-	 * SetType
-	 *
 	 * Sets the search type
 	 *
-	 * @access public
 	 * @param int $type search type
 	 */
 	public function SetType($type)
@@ -128,11 +100,8 @@
 	}
 
 	/**
-	 * GetSearch
-	 *
 	 * Gets the search query
 	 *
-	 * @access public
 	 * @return string search query
 	 */
 	public function GetSearch()
@@ -141,11 +110,8 @@
 	}
 
 	/**
-	 * SetSearch
-	 *
 	 * Sets the search query
 	 *
-	 * @access public
 	 * @param string $search search query
 	 */
 	public function SetSearch($search)
@@ -163,11 +129,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Loads the data for this search
-	 *
-	 * @access protected
 	 */
 	protected function LoadData()
 	{

--- a/include/git/FileBlame.class.php
+++ b/include/git/FileBlame.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP FileBlame
- *
  * Class to get a file's blame
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,68 +7,48 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * FileBlame class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_FileBlame
 {
 	/**
-	 * project
+	 * The project
 	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * commitHash
+	 * The commit hash
 	 *
-	 * Stores the commit hash internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $commitHash;
 
 	/**
-	 * path
+	 * The file path
 	 *
-	 * Stores the path internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $path;
 
 	/**
-	 * blame
-	 * 
-	 * Stores the blame data
+	 * Blame data
 	 *
-	 * @access protected
+	 * @var array
 	 */
 	protected $blame = array();
 
 	/**
-	 * dataLoaded
+	 * Whether data has been loaded
 	 *
-	 * Stores whether data has been loaded
-	 *
-	 * @access protected
+	 * @var boolean
 	 */
 	protected $dataLoaded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
-	 * @param mixed $commit commit to trace blame from
+	 * @param GitPHP_Project $project project
+	 * @param GitPHP_Commit $commit commit to trace blame from
 	 * @param string $path file path to trace blame of
 	 */
 	public function __construct($project, $commit, $path)
@@ -92,12 +70,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project for this file history
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -105,12 +80,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit for this file history
 	 *
-	 * @access public
-	 * @return mixed commit
+	 * @return GitPHP_Commit commit
 	 */
 	public function GetCommit()
 	{
@@ -118,11 +90,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the path for this file history
 	 *
-	 * @access public
 	 * @return string path
 	 */
 	public function GetPath()
@@ -131,11 +100,8 @@
 	}
 
 	/**
-	 * GetBlame
-	 *
 	 * Gets the blame
 	 *
-	 * @access public
 	 * @return array blame data
 	 */
 	public function GetBlame()
@@ -153,11 +119,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
-	 * Loads the history data
-	 *
-	 * @access private
+	 * Loads the blame data
 	 */
 	private function LoadData()
 	{

--- a/include/git/FileDiff.class.php
+++ b/include/git/FileDiff.class.php
@@ -1,199 +1,149 @@
 <?php
+require_once(GITPHP_BASEDIR . 'lib/php-diff/lib/Diff.php');
+require_once(GITPHP_BASEDIR . 'lib/php-diff/lib/Diff/Renderer/Text/Unified.php');
+
 /**
- * GitPHP File Diff
- *
- * Represents a single file difference
+ * Diffs two blobs
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2010 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-require_once(GITPHP_BASEDIR . 'lib/php-diff/lib/Diff.php');
-require_once(GITPHP_BASEDIR . 'lib/php-diff/lib/Diff/Renderer/Text/Unified.php');
-
-/**
- * Commit class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_FileDiff
 {
 	/**
-	 * diffInfoRead
-	 *
-	 * Stores whether diff info has been read
-	 *
-	 * @access protected
+	 * Whether diff info has been read
+	 *
+	 * @var boolean
 	 */
 	protected $diffInfoRead = false;
 
 	/**
-	 * diffDataRead
-	 *
-	 * Stores whether diff data has been read
-	 *
-	 * @access protected
+	 * Whether diff data has been read
+	 *
+	 * @var boolean
 	 */
 	protected $diffDataRead = false;
 
 	/**
-	 * diffData
-	 *
-	 * Stores the diff data
-	 *
-	 * @access protected
+	 * Diff data
+	 *
+	 * @var string
 	 */
 	protected $diffData;
 
 	/**
-	 * diffDataSplitRead
-	 *
-	 * Stores whether split diff data has been read
-	 *
-	 * @access protected
+	 * Whether split diff data has been read
+	 *
+	 * @var boolean
 	 */
 	protected $diffDataSplitRead = false;
 
 	/**
-	 * diffDataSplit
-	 *
-	 * Stores the diff data split up by left/right changes
-	 *
-	 * @access protected
+	 * Diff data split up by left/right changes
+	 *
+	 * @var array
 	 */
 	protected $diffDataSplit;
 
 	/**
-	 * diffDataName
-	 *
 	 * Filename used on last data diff
 	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $diffDataName;
 
 	/**
-	 * fromMode
-	 *
-	 * Stores the from file mode
-	 *
-	 * @access protected
+	 * From file mode
+	 *
+	 * @var string
 	 */
 	protected $fromMode;
 
 	/**
-	 * toMode
-	 *
-	 * Stores the to file mode
-	 *
-	 * @access protected
+	 * To file mode
+	 *
+	 * @var string
 	 */
 	protected $toMode;
 
 	/**
-	 * fromHash
-	 *
-	 * Stores the from hash
-	 *
-	 * @access protected
+	 * From blob hash
+	 *
+	 * @var string
 	 */
 	protected $fromHash;
 
 	/**
-	 * toHash
-	 *
-	 * Stores the to hash
-	 *
-	 * @access protected
+	 * To blob hash
+	 *
+	 * @var string
 	 */
 	protected $toHash;
 
 	/**
-	 * status
-	 *
-	 * Stores the status
-	 *
-	 * @access protected
+	 * Change status
+	 *
+	 * @var string
 	 */
 	protected $status;
 
 	/**
-	 * similarity
-	 *
-	 * Stores the similarity
-	 *
-	 * @access protected
+	 * File similarity
+	 *
+	 * @var string
 	 */
 	protected $similarity;
 
 	/**
-	 * fromFile
-	 *
-	 * Stores the from filename
-	 *
-	 * @access protected
+	 * From filename
+	 *
+	 * @var string
 	 */
 	protected $fromFile;
 
 	/**
-	 * toFile
-	 *
-	 * Stores the to filename
-	 *
-	 * @access protected
+	 * To filename
+	 *
+	 * @var string
 	 */
 	protected $toFile;
 
 	/**
-	 * fromFileType
-	 *
-	 * Stores the from file type
-	 *
-	 * @access protected
+	 * From file type
+	 *
+	 * @var string
 	 */
 	protected $fromFileType;
 
 	/**
-	 * toFileType
-	 *
-	 * Stores the to file type
-	 *
-	 * @access protected
+	 * To file type
+	 *
+	 * @var string
 	 */
 	protected $toFileType;
 
 	/**
-	 * project
-	 *
-	 * Stores the project
-	 *
-	 * @access protected
+	 * Project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * commitHash
-	 *
-	 * Stores the hash of the commit that caused this filediff
-	 *
-	 * @access protected
+	 * The hash of the commit that caused this filediff
+	 *
+	 * @var string
 	 */
 	protected $commitHash;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 * @param string $fromHash source hash, can also be a diff-tree info line
 	 * @param string $toHash target hash, required if $fromHash is a hash
-	 * @return mixed FileDiff object
-	 * @throws Exception on invalid parameters
 	 */
 	public function __construct($project, $fromHash, $toHash = '')
 	{
@@ -211,12 +161,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -224,9 +171,8 @@
 	}
 
 	/**
-	 * ParseDiffTreeLine
-	 *
-	 * @access private
+	 * Reads data from a git-formatted diff tree line
+	 *
 	 * @param string $diffTreeLine line from difftree
 	 * @return boolean true if data was read from line
 	 */
@@ -255,11 +201,7 @@
 	}
 
 	/**
-	 * ReadDiffInfo
-	 *
 	 * Reads file diff info
-	 *
-	 * @access protected
 	 */
 	protected function ReadDiffInfo()
 	{
@@ -269,12 +211,8 @@
 	}
 
 	/**
-	 * GetFromMode
-	 *
-	 * Gets the from file mode
-	 * (full a/u/g/o)
-	 *
-	 * @access public
+	 * Gets the from file mode (full a/u/g/o)
+	 *
 	 * @return string from file mode
 	 */
 	public function GetFromMode()
@@ -286,12 +224,8 @@
 	}
 
 	/**
-	 * GetFromModeShort
-	 *
-	 * Gets the from file mode in short form
-	 * (standard u/g/o)
-	 *
-	 * @access public
+	 * Gets the from file mode in short form (standard u/g/o)
+	 *
 	 * @return string short from file mode
 	 */
 	public function GetFromModeShort()
@@ -303,12 +237,8 @@
 	}
 
 	/**
-	 * GetToMode
-	 *
-	 * Gets the to file mode
-	 * (full a/u/g/o)
-	 *
-	 * @access public
+	 * Gets the to file mode (full a/u/g/o)
+	 *
 	 * @return string to file mode
 	 */
 	public function GetToMode()
@@ -320,12 +250,8 @@
 	}
 
 	/**
-	 * GetToModeShort
-	 *
-	 * Gets the to file mode in short form
-	 * (standard u/g/o)
-	 *
-	 * @access public
+	 * Gets the to file mode in short form (standard u/g/o)
+	 *
 	 * @return string short to file mode
 	 */
 	public function GetToModeShort()
@@ -337,11 +263,8 @@
 	}
 
 	/**
-	 * GetFromHash
-	 *
 	 * Gets the from hash
 	 *
-	 * @access public
 	 * @return string from hash
 	 */
 	public function GetFromHash()
@@ -350,11 +273,8 @@
 	}
 
 	/**
-	 * GetToHash
-	 *
 	 * Gets the to hash
 	 *
-	 * @access public
 	 * @return string to hash
 	 */
 	public function GetToHash()
@@ -363,12 +283,9 @@
 	}
 
 	/**
-	 * GetFromBlob
-	 *
 	 * Gets the from file blob
 	 *
-	 * @access public
-	 * @return mixed blob object
+	 * @return GitPHP_Blob|null blob object
 	 */
 	public function GetFromBlob()
 	{
@@ -379,12 +296,9 @@
 	}
 
 	/**
-	 * GetToBlob
-	 *
 	 * Gets the to file blob
 	 *
-	 * @access public
-	 * @return mixed blob object
+	 * @return GitPHP_Blob|null blob object
 	 */
 	public function GetToBlob()
 	{
@@ -395,11 +309,8 @@
 	}
 
 	/**
-	 * GetStatus
-	 *
 	 * Gets the status of the change
 	 *
-	 * @access public
 	 * @return string status
 	 */
 	public function GetStatus()
@@ -411,11 +322,8 @@
 	}
 
 	/**
-	 * GetSimilarity
-	 *
 	 * Gets the similarity
 	 *
-	 * @access public
 	 * @return string similarity
 	 */
 	public function GetSimilarity()
@@ -427,11 +335,8 @@
 	}
 
 	/**
-	 * GetFromFile
-	 *
 	 * Gets the from file name
 	 *
-	 * @access public
 	 * @return string from file
 	 */
 	public function GetFromFile()
@@ -443,11 +348,8 @@
 	}
 
 	/**
-	 * GetToFile
-	 *
 	 * Gets the to file name
 	 *
-	 * @access public
 	 * @return string to file
 	 */
 	public function GetToFile()
@@ -459,11 +361,8 @@
 	}
 
 	/**
-	 * GetFromFileType
-	 *
 	 * Gets the from file type
 	 *
-	 * @access public
 	 * @param boolean $local true if caller wants localized type
 	 * @return string from file type
 	 */
@@ -476,11 +375,8 @@
 	}
 
 	/**
-	 * GetToFileType
-	 *
 	 * Gets the to file type
 	 *
-	 * @access public
 	 * @param boolean $local true if caller wants localized type
 	 * @return string to file type
 	 */
@@ -493,11 +389,8 @@
 	}
 
 	/**
-	 * FileTypeChanged
-	 *
 	 * Tests if filetype changed
 	 *
-	 * @access public
 	 * @return boolean true if file type changed
 	 */
 	public function FileTypeChanged()
@@ -509,11 +402,8 @@
 	}
 
 	/**
-	 * FileModeChanged
-	 *
 	 * Tests if file mode changed
 	 *
-	 * @access public
 	 * @return boolean true if file mode changed
 	 */
 	public function FileModeChanged()
@@ -525,11 +415,8 @@
 	}
 
 	/**
-	 * FromFileIsRegular
-	 *
 	 * Tests if the from file is a regular file
 	 *
-	 * @access public
 	 * @return boolean true if from file is regular
 	 */
 	public function FromFileIsRegular()
@@ -541,11 +428,8 @@
 	}
 
 	/**
-	 * ToFileIsRegular
-	 *
 	 * Tests if the to file is a regular file
 	 *
-	 * @access public
 	 * @return boolean true if to file is regular
 	 */
 	public function ToFileIsRegular()
@@ -557,13 +441,12 @@
 	}
 
 	/**
-	 * GetDiff
-	 *
 	 * Gets the diff output
 	 *
-	 * @access public
 	 * @param string $file override the filename on the diff
-	 * @return string diff output
+	 * @param boolean $readFileData whether file info data should also be read
+	 * @param boolean $explode whether data should be exploded into an array of lines
+	 * @return string|string[] diff output
 	 */
 	public function GetDiff($file = '', $readFileData = true, $explode = false)
 	{
@@ -594,17 +477,15 @@
 	}
 
 	/**
-	 * GetDiffSplit
-	 *
-	 * construct the side by side diff data from the git data
+	 * Construct the side by side diff data from the git data
+	 *
 	 * The result is an array of ternary arrays with 3 elements each:
 	 * First the mode ("" or "-added" or "-deleted" or "-modified"),
 	 * then the first column, then the second.
 	 *
 	 * @author Mattias Ulbrich
 	 *
-	 * @access public
-	 * @return an array of line elements (see above)
+	 * @return array an array of line elements
 	 */
 	public function GetDiffSplit()
 	{
@@ -707,11 +588,8 @@
 	}
 
 	/**
-	 * GetDiffData
-	 *
 	 * Get diff data
 	 *
-	 * @access private
 	 * @param integer $context number of context lines
 	 * @param boolean $header true to include file header
 	 * @param string $file override file name
@@ -777,11 +655,8 @@
 	}
 
 	/**
-	 * GetPhpDiff
-	 *
 	 * Get diff using php-diff
 	 *
-	 * @access private
 	 * @param string $fromData from file data
 	 * @param string $toData to file data
 	 * @param integer $context context lines
@@ -797,11 +672,8 @@
 	}
 
 	/**
-	 * UseXDiff
-	 *
 	 * Returns whether xdiff should be used
 	 *
-	 * @access private
 	 * @return boolean true if xdiff should be used
 	 */
 	private function UseXDiff()
@@ -810,11 +682,8 @@
 	}
 
 	/**
-	 * GetXDiff
-	 *
 	 * Get diff using xdiff
 	 *
-	 * @access private
 	 * @param string $fromData from file data
 	 * @param string $toData to file data
 	 * @param integer $context context lines
@@ -826,12 +695,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit for this filediff
 	 *
-	 * @access public
-	 * @return commit object
+	 * @return GitPHP_Commit commit object
 	 */
 	public function GetCommit()
 	{
@@ -839,12 +705,9 @@
 	}
 
 	/**
-	 * SetCommit
-	 *
 	 * Sets the commit for this filediff
 	 *
-	 * @access public
-	 * @param mixed $commit commit object
+	 * @param GitPHP_Commit $commit commit object
 	 */
 	public function SetCommit($commit)
 	{
@@ -855,11 +718,8 @@
 	}
 
 	/**
-	 * SetCommitHash
-	 *
 	 * Sets the hash of the commit for this filediff
 	 *
-	 * @access public
 	 * @param string $hash hash
 	 */
 	public function SetCommitHash($hash)

--- a/include/git/FileHistory.class.php
+++ b/include/git/FileHistory.class.php
@@ -1,76 +1,54 @@
 <?php
 /**
- * GitPHP FileHistory
- *
- * Class to represent a file's history
+ * Class to load a file's history
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2012 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * FileHistory class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_FileHistory implements Iterator
 {
 	/**
-	 * project
-	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * commitHash
-	 *
-	 * Stores the commit hash internally
-	 *
-	 * @access protected
+	 * The commit hash
+	 *
+	 * @var string
 	 */
 	protected $commitHash;
 
 	/**
-	 * path
-	 *
-	 * Stores the path internally
-	 *
-	 * @access protected
+	 * The path
+	 *
+	 * @var string
 	 */
 	protected $path;
 
 	/**
-	 * history
-	 *
-	 * Stores the history data
-	 *
-	 * @access protected
+	 * The history
+	 *
+	 * @var GitPHP_FileDiff[]
 	 */
 	protected $history = array();
 
 	/**
-	 * dataLoaded
-	 *
-	 * Stores whether data has been loaded
-	 *
-	 * @access protected
+	 * Whether data has been loaded
+	 *
+	 * @var boolean
 	 */
 	protected $dataLoaded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
-	 * @param mixed $commit commit to start history from
+	 * @param GitPHP_Project $project project
+	 * @param GitPHP_Commit $commit commit to start history from
 	 * @param string $path file path to trace history of
 	 */
 	public function __construct($project, $commit, $path)
@@ -92,12 +70,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project for this file history
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -105,12 +80,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit for this file history
 	 *
-	 * @access public
-	 * @return mixed commit
+	 * @return GitPHP_Commit commit
 	 */
 	public function GetCommit()
 	{
@@ -118,11 +90,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the path for this file history
 	 *
-	 * @access public
 	 * @return string path
 	 */
 	public function GetPath()
@@ -131,12 +100,9 @@
 	}
 
 	/**
-	 * GetHistory
-	 *
 	 * Gets the history
 	 *
-	 * @access public
-	 * @return array history data
+	 * @return GitPHP_FileDiff[] history data
 	 */
 	public function GetHistory()
 	{
@@ -147,11 +113,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Loads the history data
-	 *
-	 * @access private
 	 */
 	private function LoadData()
 	{
@@ -188,9 +150,9 @@
 	}
 
 	/**
-	 * rewind
-	 *
 	 * Rewinds the iterator
+	 *
+	 * @return GitPHP_FileDiff
 	 */
 	function rewind()
 	{
@@ -202,9 +164,9 @@
 	}
 
 	/**
-	 * current
-	 *
 	 * Returns the current revision
+	 *
+	 * @return GitPHP_FileDiff
 	 */
 	function current()
 	{
@@ -216,9 +178,9 @@
 	}
 
 	/**
-	 * key
-	 *
 	 * Returns the current key
+	 *
+	 * @return int
 	 */
 	function key()
 	{
@@ -230,9 +192,9 @@
 	}
 
 	/**
-	 * next
-	 *
 	 * Advance the pointer
+	 *
+	 * @return GitPHP_FileDiff|boolean
 	 */
 	function next()
 	{
@@ -244,9 +206,9 @@
 	}
 
 	/**
-	 * valid
-	 *
 	 * Test for a valid pointer
+	 *
+	 * @return boolean
 	 */
 	function valid()
 	{

--- a/include/git/FileSearch.class.php
+++ b/include/git/FileSearch.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP FileSearch
- *
  * Class to represent a file search
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,104 +7,76 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * FileSearch class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_FileSearch implements Iterator, GitPHP_Pagination_Interface
 {
 	/**
-	 * project
-	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * treeHash
-	 *
-	 * Stores the tree hash internally
-	 *
-	 * @access protected
+	 * Tree hash
+	 *
+	 * @var string
 	 */
 	protected $treeHash;
 
 	/**
-	 * treePath
-	 *
-	 * Stores the tree path internally
-	 *
-	 * @access protected
+	 * Tree path
+	 *
+	 * @var string
 	 */
 	protected $treePath;
 
 	/**
-	 * allResults
-	 *
-	 * Stores the list of results internally
-	 *
-	 * @access protected
+	 * The list of all results
+	 *
+	 * @var GitPHP_FileSearchResult[]
 	 */
 	protected $allResults = array();
 
 	/**
-	 * resultList
-	 *
-	 * Stores the limited subset of results internally
-	 *
-	 * @access protected
+	 * The paginated subset of results
+	 *
+	 * @var GitPHP_FileSearchResult[]
 	 */
 	protected $resultList;
 
 	/**
-	 * search
-	 *
-	 * Stores the search string
-	 *
-	 * @access protected
+	 * Search string
+	 *
+	 * @var string
 	 */
 	protected $search;
 
 	/**
-	 * limit
-	 *
-	 * Stores the limit of objects to load
-	 *
-	 * @access protected
+	 * The limit of objects to load
+	 *
+	 * @var int
 	 */
 	protected $limit = 50;
 
 	/**
-	 * skip
-	 *
-	 * Stores the number of objects to skip
-	 *
-	 * @access protected
+	 * The number of objects to skip
+	 *
+	 * @var int
 	 */
 	protected $skip = 0;
 
 	/**
-	 * dataLoaded
-	 *
-	 * Stores whether data has been loaded
-	 *
-	 * @access protected
+	 * Whether data has been loaded
+	 *
+	 * @var boolean
 	 */
 	protected $dataLoaded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
-	 * @param mixed $tree tree to search
+	 * @param GitPHP_Project $project project
+	 * @param GitPHP_Tree $tree tree to search
 	 * @param string $search string to search
 	 * @param int $limit limit of results to return
 	 * @param int $skip number of results to skip
@@ -138,11 +108,9 @@
 	}
 
 	/**
-	 * GetTree
-	 *
 	 * Gets the tree for this search
 	 *
-	 * @access public
+	 * @return GitPHP_Tree tree
 	 */
 	public function GetTree()
 	{
@@ -152,11 +120,8 @@
 	}
 
 	/**
-	 * GetSearch
-	 *
-	 * Gets the search
-	 *
-	 * @access public
+	 * Gets the search string
+	 *
 	 * @return string search
 	 */
 	public function GetSearch()
@@ -165,11 +130,8 @@
 	}
 
 	/**
-	 * SetSearch
-	 *
-	 * Sets the search
-	 *
-	 * @access public
+	 * Sets the search string
+	 *
 	 * @param string $search search
 	 */
 	public function SetSearch($search)
@@ -188,11 +150,8 @@
 	}
 
 	/**
-	 * GetCount
-	 *
-	 * Gets the count
-	 *
-	 * @access public
+	 * Gets the count of results
+	 *
 	 * @return int count
 	 */
 	public function GetCount()
@@ -205,11 +164,8 @@
 	}
 
 	/**
-	 * GetLimit
-	 *
 	 * Gets the limit
 	 *
-	 * @access public
 	 * @return int limit
 	 */
 	public function GetLimit()
@@ -218,11 +174,8 @@
 	}
 
 	/**
-	 * SetLimit
-	 *
 	 * Sets the limit
 	 *
-	 * @access public
 	 * @param int $limit limit
 	 */
 	public function SetLimit($limit)
@@ -244,11 +197,8 @@
 	}
 
 	/**
-	 * GetSkip
-	 *
 	 * Gets the skip number
 	 *
-	 * @access public
 	 * @return int skip number
 	 */
 	public function GetSkip()
@@ -257,11 +207,8 @@
 	}
 
 	/**
-	 * SetSkip
-	 *
 	 * Sets the skip number
 	 *
-	 * @access public
 	 * @param int $skip skip number
 	 */
 	public function SetSkip($skip)
@@ -277,9 +224,9 @@
 	}
 
 	/**
-	 * rewind
-	 *
 	 * Rewinds the iterator
+	 *
+	 * @return GitPHP_FileSearchResult
 	 */
 	function rewind()
 	{
@@ -291,9 +238,9 @@
 	}
 
 	/**
-	 * current
-	 *
 	 * Returns the current revision
+	 *
+	 * @return GitPHP_FileSearchResult
 	 */
 	function current()
 	{
@@ -305,9 +252,9 @@
 	}
 
 	/**
-	 * key
-	 *
 	 * Returns the current key
+	 *
+	 * @return int
 	 */
 	function key()
 	{
@@ -319,9 +266,9 @@
 	}
 
 	/**
-	 * next
-	 *
 	 * Advance the pointer
+	 *
+	 * @return GitPHP_FileSearchResult|boolean
 	 */
 	function next()
 	{
@@ -333,9 +280,9 @@
 	}
 
 	/**
-	 * valid
-	 *
 	 * Test for a valid pointer
+	 *
+	 * @return boolean
 	 */
 	function valid()
 	{
@@ -347,11 +294,7 @@
 	}
 
 	/**
-	 * Clear
-	 *
 	 * Clears the results
-	 *
-	 * @access public
 	 */
 	public function Clear()
 	{
@@ -365,11 +308,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Load search data
-	 *
-	 * @access private
 	 */
 	private function LoadData()
 	{
@@ -385,11 +324,7 @@
 	}
 
 	/**
-	 * SearchFilenames
-	 *
 	 * Searches file names for matches
-	 *
-	 * @access private
 	 */
 	private function SearchFilenames()
 	{
@@ -423,11 +358,7 @@
 	}
 
 	/**
-	 * SearchFileContents
-	 *
 	 * Searches file contents for matches
-	 *
-	 * @access private
 	 */
 	private function SearchFileContents()
 	{
@@ -474,11 +405,7 @@
 	}
 
 	/**
-	 * UpdateSubset
-	 *
 	 * Extracts the subset of results based on size limits
-	 *
-	 * @access private
 	 */
 	private function UpdateSubset()
 	{

--- a/include/git/FileSearchResult.class.php
+++ b/include/git/FileSearchResult.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP FileSearchResult
- *
  * Class to represent a single result of a file search
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,68 +7,48 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * FileSearchResult
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_FileSearchResult
 {
 	/**
-	 * project
+	 * The project
 	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * objectType
+	 * The object type
 	 *
-	 * Stores the object type internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $objectType;
 
 	/**
-	 * objectHash
+	 * The object hash
 	 *
-	 * Stores the object hash internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $objectHash;
 
 	/**
-	 * matchingLines
+	 * Matching lines from blob
 	 *
-	 * stores matching lines internally
-	 *
-	 * @access protected
+	 * @var string[]
 	 */
 	protected $matchingLines;
 
 	/**
-	 * path
+	 * The matching path
 	 *
-	 * Stores the matching path internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $path;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project the project
-	 * @param mixed $object matching object
+	 * @param GitPHP_Project $project the project
+	 * @param GitPHP_Tree|GitPHP_Blob $object matching object
 	 * @param string $path matching path
 	 */
 	public function __construct($project, $object, $path)
@@ -87,12 +65,9 @@
 	}
 
 	/**
-	 * GetObject
-	 *
 	 * Gets the matching object
 	 *
-	 * @access public
-	 * @return mixed matching object
+	 * @return GitPHP_Tree|GitPHP_Blob|null matching object
 	 */
 	public function GetObject()
 	{
@@ -110,12 +85,9 @@
 	}
 
 	/**
-	 * SetObject
-	 *
 	 * Sets the matching object
 	 *
-	 * @access public
-	 * @param mixed $object matching object
+	 * @param GitPHP_Tree|GitPHP_Blob $object matching object
 	 */
 	public function SetObject($object)
 	{
@@ -131,11 +103,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the matching path
 	 *
-	 * @access public
 	 * @return string path
 	 */
 	public function GetPath()
@@ -144,11 +113,8 @@
 	}
 
 	/**
-	 * SetPath
-	 *
 	 * Sets the matching path
 	 *
-	 * @access public
 	 * @param string $path path
 	 */
 	public function SetPath($path)
@@ -157,12 +123,9 @@
 	}
 
 	/**
-	 * GetMatchingLines
-	 *
 	 * Gets the list of matching lines
 	 *
-	 * @access public
-	 * @return array array of matching lines
+	 * @return string[] array of matching lines
 	 */
 	public function GetMatchingLines()
 	{
@@ -170,12 +133,9 @@
 	}
 
 	/**
-	 * SetMatchingLines
-	 *
 	 * Sets the list of matching lines
 	 *
-	 * @access public
-	 * @param array $lines matching lines
+	 * @param string[] $lines matching lines
 	 */
 	public function SetMatchingLines($lines)
 	{

--- a/include/git/FilesystemObject.class.php
+++ b/include/git/FilesystemObject.class.php
@@ -1,81 +1,55 @@
 <?php
 /**
- * GitPHP Filesystem Object
- *
- * Base class for all git objects that represent
- * a filesystem item
+ * Base class for all git objects that represent a filesystem item
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2010 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Git Filesystem object class
- *
- * @abstract
- * @package GitPHP
- * @subpackage Git
- */
 abstract class GitPHP_FilesystemObject extends GitPHP_GitObject
 {
 
 	/**
-	 * path
-	 *
-	 * Stores the object path
-	 *
-	 * @access protected
+	 * The object path
+	 *
+	 * @var string
 	 */
 	protected $path = '';
 
 	/**
-	 * mode
-	 *
-	 * Stores the object mode
-	 *
-	 * @access protected
+	 * The object mode
+	 *
+	 * @var string
 	 */
 	protected $mode;
 
 	/**
-	 * commitHash
-	 *
-	 * Stores the hash of the commit this object belongs to
-	 *
-	 * @access protected
+	 * The hash of the commit this object belongs to
+	 *
+	 * @var string
 	 */
 	protected $commitHash;
 
 	/**
-	 * pathTree
-	 *
-	 * Stores the trees of this object's base path
-	 *
-	 * @access protected
+	 * The trees of this object's base path
+	 *
+	 * @var array
 	 */
 	protected $pathTree;
 
 	/**
-	 * pathTreeRead
-	 *
-	 * Stores whether the trees of the object's base path have been read
-	 *
-	 * @access protected
+	 * Whether the trees of the object's base path have been read
+	 *
+	 * @var boolean
 	 */
 	protected $pathTreeRead = false;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash object hash
-	 * @return mixed git filesystem object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -83,11 +57,8 @@
 	}
 
 	/**
-	 * GetName
-	 *
 	 * Gets the object name
 	 *
-	 * @access public
 	 * @return string name
 	 */
 	public function GetName()
@@ -99,11 +70,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the full path
 	 *
-	 * @access public
 	 * @return string path
 	 */
 	public function GetPath()
@@ -115,11 +83,8 @@
 	}
 
 	/**
-	 * SetPath
-	 *
 	 * Sets the object path
 	 *
-	 * @access public
 	 * @param string $path object path
 	 */
 	public function SetPath($path)
@@ -128,11 +93,8 @@
 	}
 
 	/**
-	 * GetMode
-	 *
 	 * Gets the object mode
 	 *
-	 * @access public
 	 * @return string mode
 	 */
 	public function GetMode()
@@ -141,11 +103,8 @@
 	}
 
 	/**
-	 * GetModeString
-	 *
 	 * Gets the mode as a readable string
 	 *
-	 * @access public
 	 * @return string mode string
 	 */
 	public function GetModeString()
@@ -174,11 +133,8 @@
 	}
 
 	/**
-	 * SetMode
-	 *
 	 * Sets the object mode
 	 *
-	 * @access public
 	 * @param string $mode tree mode
 	 */
 	public function SetMode($mode)
@@ -187,12 +143,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit this object belongs to
 	 *
-	 * @access public
-	 * @return mixed commit object
+	 * @return GitPHP_Commit commit object
 	 */
 	public function GetCommit()
 	{
@@ -200,12 +153,9 @@
 	}
 
 	/**
-	 * SetCommit
-	 *
 	 * Sets the commit this object belongs to
 	 *
-	 * @access public
-	 * @param mixed $commit commit object
+	 * @param GitPHP_Commit $commit commit object
 	 */
 	public function SetCommit($commit)
 	{
@@ -216,11 +166,8 @@
 	}
 
 	/**
-	 * SetCommitHash
-	 *
 	 * Sets the hash of the commit this object belongs to
 	 *
-	 * @access public
 	 * @param string $commitHash commit hash
 	 */
 	public function SetCommitHash($commitHash)
@@ -232,12 +179,9 @@
 	}
 
 	/**
-	 * GetPathTree
-	 *
 	 * Gets the objects of the base path
 	 *
-	 * @access public
-	 * @return array array of tree objects
+	 * @return GitPHP_Tree[] array of tree objects
 	 */
 	public function GetPathTree()
 	{
@@ -265,11 +209,7 @@
 	}
 
 	/**
-	 * ReadPathTree
-	 *
 	 * Reads the objects of the base path
-	 *
-	 * @access private
 	 */
 	private function ReadPathTree()
 	{
@@ -301,14 +241,10 @@
 	}
 
 	/**
-	 * ComparePath
-	 *
 	 * Compares two objects by path
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first object
-	 * @param mixed $b second object
+	 * @param GitPHP_FilesystemObject $a first object
+	 * @param GitPHP_FilesystemObject $b second object
 	 * @return integer comparison result
 	 */
 	public static function ComparePath($a, $b)

--- a/include/git/GitConfig.class.php
+++ b/include/git/GitConfig.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP GitConfig
- *
  * Parses Git configuration files
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,19 +7,10 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * GitConfig class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_GitConfig
 {
 
 	/**
-	 * TypeDefault
-	 *
 	 * Default config value type (no conversion)
 	 *
 	 * @const
@@ -29,8 +18,6 @@
 	const TypeDefault = 1;
 
 	/**
-	 * TypeInteger
-	 *
 	 * Integer config value type
 	 *
 	 * @const
@@ -38,8 +25,6 @@
 	const TypeInteger = 2;
 
 	/**
-	 * TypeBoolean
-	 *
 	 * Boolean config value type
 	 *
 	 * @const
@@ -47,39 +32,30 @@
 	const TypeBoolean = 3;
 	
 	/**
-	 * configPath
-	 *
-	 * Stores the config file path internally
-	 *
-	 * @access protected
+	 * The config file path
+	 *
+	 * @var string
 	 */
 	protected $configPath = null;
 
 	/**
-	 * configRead
-	 *
-	 * Stores whether the config file has been loaded
-	 *
-	 * @access protected
+	 * Whether the config file has been loaded
+	 *
+	 * @var string
 	 */
 	protected $configRead = false;
 
 	/**
-	 * config
-	 *
-	 * Stores config values
-	 *
-	 * @access protected
+	 * Config values
+	 *
+	 * @var array
 	 */
 	protected $config = array();
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param string $configPath config file path
 	 */
 	public function __construct($configPath)
 	{
@@ -91,11 +67,8 @@
 	}
 
 	/**
-	 * GetValue
-	 *
 	 * Gets a config value
 	 *
-	 * @access public
 	 * @param string $key config key
 	 * @param boolean $multiValue true to support multivalue config variables
 	 * @param int $forceType force interpretation as a certain type
@@ -150,11 +123,8 @@
 	}
 
 	/**
-	 * HasValue
-	 *
 	 * Tests if a config value exists
 	 *
-	 * @access public
 	 * @param string $key config key
 	 * @return boolean true if value exists
 	 */
@@ -171,11 +141,7 @@
 	}
 
 	/**
-	 * LoadConfig
-	 *
 	 * Loads the config data
-	 *
-	 * @access private
 	 */
 	private function LoadConfig()
 	{
@@ -240,12 +206,8 @@
 	}
 
 	/**
-	 * GetType
-	 *
 	 * Gets the default type of a config value
 	 *
-	 * @access protected
-	 * @static
 	 * @param string $key config key
 	 * @return int config value type
 	 */
@@ -262,12 +224,8 @@
 	}
 
 	/**
-	 * ToBool
-	 *
 	 * Interpret git config boolean values
 	 *
-	 * @access protected
-	 * @static
 	 * @param mixed $value value to interpret
 	 * @return boolean boolean interpretation
 	 */
@@ -294,12 +252,8 @@
 	}
 
 	/**
-	 * Unescape
-	 *
 	 * Parses escaped values and comments from git configs
 	 *
-	 * @access protected
-	 * @static
 	 * @param string $value value
 	 * @return string unescaped value
 	 */

--- a/include/git/GitExe.class.php
+++ b/include/git/GitExe.class.php
@@ -1,7 +1,66 @@
 <?php
-/**
- * GitPHP GitExe
- *
+
+/**
+ * git cat-file constant
+ */
+define('GIT_CAT_FILE','cat-file');
+
+/**
+ * git diff-tree constant
+ */
+define('GIT_DIFF_TREE','diff-tree');
+
+/**
+ * git ls-tree constant
+ */
+define('GIT_LS_TREE','ls-tree');
+
+/**
+ * git rev-list constant
+ */
+define('GIT_REV_LIST','rev-list');
+
+/**
+ * git rev-parse constant
+ */
+define('GIT_REV_PARSE','rev-parse');
+
+/**
+ * git show-ref constant
+ */
+define('GIT_SHOW_REF','show-ref');
+
+/**
+ * git archive constant
+ */
+define('GIT_ARCHIVE','archive');
+
+/**
+ * git grep constant
+ */
+define('GIT_GREP','grep');
+
+/**
+ * git blame constant
+ */
+define('GIT_BLAME','blame');
+
+/**
+ * git name-rev constant
+ */
+define('GIT_NAME_REV','name-rev');
+
+/**
+ * git for-each-ref constant
+ */
+define('GIT_FOR_EACH_REF','for-each-ref');
+
+/**
+ * git config constant
+ */
+define('GIT_CONFIG','config');
+
+/**
  * Class to wrap git executable
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,77 +68,41 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Constants for git commands
- */
-define('GIT_CAT_FILE','cat-file');
-define('GIT_DIFF_TREE','diff-tree');
-define('GIT_LS_TREE','ls-tree');
-define('GIT_REV_LIST','rev-list');
-define('GIT_REV_PARSE','rev-parse');
-define('GIT_SHOW_REF','show-ref');
-define('GIT_ARCHIVE','archive');
-define('GIT_GREP','grep');
-define('GIT_BLAME','blame');
-define('GIT_NAME_REV','name-rev');
-define('GIT_FOR_EACH_REF','for-each-ref');
-define('GIT_CONFIG','config');
-
-/**
- * Git Executable class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_GitExe
 {
 
 	/**
-	 * instance
-	 *
-	 * Stores the singleton instance
-	 *
-	 * @access protected
-	 * @static
+	 * The singleton instance
+	 *
+	 * @var GitPHP_GitExe
 	 */
 	protected static $instance;
 
 	/**
-	 * binary
-	 *
-	 * Stores the binary path internally
-	 *
-	 * @access protected
+	 * The binary path
+	 *
+	 * @var string
 	 */
 	protected $binary;
 	
 	/**
-	 * version
-	 *
-	 * Stores the binary version internally
-	 *
-	 * @access protected
+	 * The binary version
+	 *
+	 * @var string
 	 */
 	protected $version;
 
 	/**
-	 * versionRead
-	 *
-	 * Stores whether the version has been read
-	 *
-	 * @access protected
+	 * Whether the version has been read
+	 *
+	 * @var boolean
 	 */
 	protected $versionRead = false;
 
 	/**
-	 * GetInstance
-	 *
 	 * Returns the singleton instance
 	 *
-	 * @access public
-	 * @static
-	 * @return mixed instance of git exe classe
+	 * @return GitPHP_GitExe instance of git exe classe
 	 */
 	public static function GetInstance()
 	{
@@ -90,12 +113,7 @@
 	}
 
 	/**
-	 * DestroyInstance
-	 *
 	 * Releases the singleton instance
-	 *
-	 * @access public
-	 * @static
 	 */
 	public static function DestroyInstance()
 	{
@@ -103,13 +121,9 @@
 	}
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access protected
 	 * @param string $binary path to git binary
-	 * @return mixed git executable class
 	 */
 	protected function __construct($binary)
 	{
@@ -120,13 +134,11 @@
 	}
 
 	/**
-	 * Execute
-	 *
 	 * Executes a command
 	 *
 	 * @param string $projectPath path to project
 	 * @param string $command the command to execute
-	 * @param array $args arguments
+	 * @param string[] $args arguments
 	 * @return string result of command
 	 */
 	public function Execute($projectPath, $command, $args)
@@ -144,13 +156,12 @@
 	}
 
 	/**
-	 * Open
-	 *
 	 * Opens a resource to a command
 	 *
 	 * @param string $projectPath path to project
 	 * @param string $command the command to execute
-	 * @param array $args arguments
+	 * @param string[] $args arguments
+	 * @param string $mode process open mode
 	 * @return resource process handle
 	 */
 	public function Open($projectPath, $command, $args, $mode = 'r')
@@ -161,16 +172,12 @@
 	}
 
 	/**
-	 * BuildCommand
-	 *
 	 * Creates a command
-	 *
-	 * @access protected
 	 *
 	 * @param string $projectPath path to project
 	 * @param string $command the command to execute
-	 * @param array $args arguments
-	 * @return string result of command
+	 * @param string[] $args arguments
+	 * @return string full executable string
 	 */
 	protected function CreateCommand($projectPath, $command, $args)
 	{
@@ -183,12 +190,9 @@
 	}
 
 	/**
-	 * GetBinary
-	 *
 	 * Gets the binary for this executable
 	 *
 	 * @return string binary
-	 * @access public
 	 */
 	public function GetBinary()
 	{
@@ -196,12 +200,9 @@
 	}
 
 	/**
-	 * GetVersion
-	 *
 	 * Gets the version of the git binary
 	 *
 	 * @return string version
-	 * @access public
 	 */
 	public function GetVersion()
 	{
@@ -212,11 +213,7 @@
 	}
 
 	/**
-	 * ReadVersion
-	 *
 	 * Reads the git version
-	 *
-	 * @access protected
 	 */
 	protected function ReadVersion()
 	{
@@ -232,11 +229,8 @@
 	}
 
 	/**
-	 * CanSkip
-	 *
 	 * Tests if this version of git can skip through the revision list
 	 *
-	 * @access public
 	 * @return boolean true if we can skip
 	 */
 	public function CanSkip()
@@ -255,11 +249,8 @@
 	}
 
 	/**
-	 * CanShowSizeInTree
-	 *
 	 * Tests if this version of git can show the size of a blob when listing a tree
 	 *
-	 * @access public
 	 * @return true if we can show sizes
 	 */
 	public function CanShowSizeInTree()
@@ -282,11 +273,8 @@
 	}
 
 	/**
-	 * CanIgnoreRegexpCase
-	 *
 	 * Tests if this version of git has the regexp tuning option to ignore regexp case
 	 *
-	 * @access public
 	 * @return true if we can ignore regexp case
 	 */
 	public function CanIgnoreRegexpCase()
@@ -307,11 +295,8 @@
 	}
 
 	/**
-	 * Valid
-	 *
 	 * Tests if this executable is valid
 	 *
-	 * @access public
 	 * @return boolean true if valid
 	 */
 	public function Valid()
@@ -326,12 +311,8 @@
 	}
 
 	/**
-	 * DefaultBinary
-	 *
 	 * Gets the default binary for the platform
 	 *
-	 * @access public
-	 * @static
 	 * @return string binary
 	 */
 	public static function DefaultBinary()

--- a/include/git/GitObject.class.php
+++ b/include/git/GitObject.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP GitObject
- *
  * Base class for all hash objects in a git repository
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,71 +7,48 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Git Object class
- *
- * @abstract
- * @package GitPHP
- * @subpackage Git
- */
 abstract class GitPHP_GitObject
 {
 	/**
-	 * project
+	 * The project
 	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * hash
+	 * The hash of the object
 	 *
-	 * Stores the hash of the object internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $hash;
 
 	/**
-	 * abbreviatedHash
+	 * The abbreviated hash of the object
 	 *
-	 * Stores the abbreviated hash of the object internally
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $abbreviatedHash;
 
 	/**
-	 * abbreviatedHashLoaded
+	 * Whether the abbreviated hash has been loaded
 	 *
-	 * Stores whether the abbreviated hash has been loaded
-	 *
-	 * @access protected
+	 * @var boolean
 	 */
 	protected $abbreviatedHashLoaded = false;
 
 	/**
-	 * compat
+	 * Whether this object should load in compatibility mode
 	 *
-	 * Stores whether this object should load in compatibility mode
-	 *
-	 * @access protected
+	 * @var boolean
 	 */
 	protected $compat = false;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash object hash
-	 * @return mixed git object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -82,12 +57,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -95,12 +67,9 @@
 	}
 
 	/**
-	 * SetProject
-	 *
 	 * Sets the project
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 */
 	public function SetProject($project)
 	{
@@ -108,11 +77,8 @@
 	}
 
 	/**
-	 * GetHash
-	 *
 	 * Gets the hash
 	 *
-	 * @access public
 	 * @param boolean $abbreviate true to abbreviate hash
 	 * @return string object hash
 	 */
@@ -133,13 +99,10 @@
 	}
 
 	/**
-	 * SetHash
-	 *
 	 * Attempts to set the hash of this object
 	 *
 	 * @param string $hash the hash to set
 	 * @throws Exception on invalid hash
-	 * @access protected
 	 */
 	protected function SetHash($hash)
 	{
@@ -150,11 +113,8 @@
 	}
 
 	/**
-	 * GetCompat
-	 *
 	 * Gets whether this object is in compatibility mode
 	 *
-	 * @access public
 	 * @return bool true if compatibility mode
 	 */
 	public function GetCompat()
@@ -163,11 +123,8 @@
 	}
 
 	/**
-	 * SetCompat
-	 *
 	 * Sets whether this object should run in compatibility mode
 	 *
-	 * @access public
 	 * @param bool $compat true if compatibility mode
 	 */
 	public function SetCompat($compat)
@@ -176,12 +133,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{
@@ -189,11 +143,8 @@
 	}
 
 	/**
-	 * GetCacheKey
-	 *
 	 * Gets the cache key to use for this object
 	 *
-	 * @access public
 	 * @return string cache key
 	 */
 	public function GetCacheKey()

--- a/include/git/GitObjectLoader.class.php
+++ b/include/git/GitObjectLoader.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP GitObjectLoader
- *
  * Handles loading data from raw git objects
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,49 +7,33 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * GitObjectLoader
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_GitObjectLoader
 {
 	/**
-	 * project
-	 *
-	 * Stores the project
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * packs
-	 *
-	 * Stores the list of packs
-	 *
-	 * @access protected
+	 * The list of packs
+	 *
+	 * @var GitPHP_Pack[]
 	 */
 	protected $packs = array();
 
 	/**
-	 * packsRead
-	 *
-	 * Stores whether packs have been read
-	 *
-	 * @access protected
+	 * Whether packs have been read
+	 *
+	 * @var boolean
 	 */
 	protected $packsRead = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 */
 	public function __construct($project)
 	{
@@ -62,12 +44,10 @@
 	}
 
 	/**
-	 * GetObject
-	 *
 	 * Gets the raw content of an object
 	 *
-	 * @access public
 	 * @param string $hash object hash
+	 * @param int $type returns the object type
 	 * @return string object data
 	 */
 	public function GetObject($hash, &$type = 0)
@@ -114,11 +94,7 @@
 	}
 
 	/**
-	 * ReadPacks
-	 *
 	 * Read the list of packs in the repository
-	 *
-	 * @access private
 	 */
 	private function ReadPacks()
 	{
@@ -134,11 +110,8 @@
 	}
 
 	/**
-	 * EnsureUniqueHash
-	 *
 	 * Ensures a hash prefix is unique
 	 *
-	 * @access public
 	 * @param string $hash full hash
 	 * @param string $prefix abbreviated hash prefix
 	 */
@@ -197,13 +170,10 @@
 	}
 
 	/**
-	 * ExpandHash
-	 *
 	 * Expands an abbreviated hash to the full hash
 	 *
-	 * @access public
-	 * @param string $abbrevHash
-	 * @return string hash
+	 * @param string $abbrevHash abbreviated hash
+	 * @return string full hash
 	 */
 	public function ExpandHash($abbrevHash)
 	{
@@ -231,13 +201,10 @@
 	}
 
 	/**
-	 * FindHashObjects
-	 *
 	 * Finds loose hash files matching a given prefix
 	 *
-	 * @access private
 	 * @param string $prefix hash prefix
-	 * @return array array of hash objects
+	 * @return string[] array of hashes
 	 */
 	private function FindHashObjects($prefix)
 	{

--- a/include/git/Head.class.php
+++ b/include/git/Head.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Head
- *
  * Represents a single head
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,27 +7,15 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Head class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Head extends GitPHP_Ref
 {
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates head
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $head head name
 	 * @param string $headHash head hash
-	 * @return mixed head object
-	 * @throws Exception exception on invalid head or hash
 	 */
 	public function __construct($project, $head, $headHash = '')
 	{
@@ -37,12 +23,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit for this head
 	 *
-	 * @access public
-	 * @return mixed commit object for this tag
+	 * @return GitPHP_Commit commit object for this head
 	 */
 	public function GetCommit()
 	{
@@ -50,14 +33,10 @@
 	}
 	
 	/**
-	 * CompareAge
-	 *
 	 * Compares two heads by age
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first head
-	 * @param mixed $b second head
+	 * @param GitPHP_Head $a first head
+	 * @param GitPHP_Head $b second head
 	 * @return integer comparison result
 	 */
 	public static function CompareAge($a, $b)
@@ -68,12 +47,8 @@
 	}
 
 	/**
-	 * CacheKey
-	 *
 	 * Generates a head hash key
 	 *
-	 * @access public
-	 * @static
 	 * @param string $proj project
 	 * @param string $head head name
 	 * @return string cache key

--- a/include/git/HeadList.class.php
+++ b/include/git/HeadList.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP HeadList
- *
  * Class representing a list of heads
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,22 +7,12 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * HeadList
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_HeadList extends GitPHP_RefList
 {
 	/**
-	 * GetHeads
-	 *
 	 * Gets the heads
 	 *
-	 * @access public
-	 * @return array array of heads
+	 * @return GitPHP_Head[] array of heads
 	 */
 	public function GetHeads()
 	{
@@ -41,11 +29,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Load head data
-	 *
-	 * @access protected
 	 */
 	protected function LoadData()
 	{
@@ -58,11 +42,8 @@
 	}
 
 	/**
-	 * GetHead
-	 *
 	 * Gets a head
 	 *
-	 * @access public
 	 * @param string $head head
 	 */
 	public function GetHead($head)
@@ -80,14 +61,11 @@
 	}
 
 	/**
-	 * GetOrderedHeads
-	 *
 	 * Gets heads in a specific order
 	 *
-	 * @access public
 	 * @param string $order order to use
 	 * @param int $count limit the number of results
-	 * @return array array of heads
+	 * @return GitPHP_Head[] array of heads
 	 */
 	public function GetOrderedHeads($order, $count = 0)
 	{
@@ -109,14 +87,11 @@
 	}
 
 	/**
-	 * GetOrderedHeadsRaw
+	 * Get heads in a specific order using raw objects
 	 *
-	 * Get heads in a specific order
-	 *
-	 * @access public
 	 * @param string $order order to use
 	 * @param int $count limit the number of results
-	 * @return array array of heads
+	 * @return GitPHP_Head[] array of heads
 	 */
 	private function GetOrderedHeadsRaw($order, $count = 0)
 	{
@@ -137,9 +112,9 @@
 	}
 
 	/**
-	 * current
+	 * Returns the current head (overrides base)
 	 *
-	 * Returns the current revision (overrides base)
+	 * @return GitPHP_Head
 	 */
 	function current()
 	{

--- a/include/git/Log.class.php
+++ b/include/git/Log.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Log
- *
  * Class to represent a project log
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,40 +7,25 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Log class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Log extends GitPHP_RevList
 {
 	/**
-	 * compat
+	 * Whether this log is operating in compatibility mode
 	 *
-	 * Stores whether this log is operating in compatibility mode
-	 *
-	 * @access protected
+	 * @var boolean
 	 */
 	protected $compat = false;
 
 	/**
-	 * skipFallback
+	 * The threshold at which log skips will fallback to the git executable
 	 *
-	 * Stores the threshold at which log skips will
-	 * fallback to the git executable
-	 *
-	 * @access protected
+	 * @var int
 	 */
 	protected $skipFallback = 200;
 
 	/**
-	 * GetCompat
-	 *
 	 * Gets whether this log is operating in compatibilty mode
 	 *
-	 * @access public
 	 * @return bool true if compatibility mode is on
 	 */
 	public function GetCompat()
@@ -51,11 +34,8 @@
 	}
 
 	/**
-	 * SetCompat
-	 *
 	 * Sets whether this log is operating in compatibility mode
 	 *
-	 * @access public
 	 * @param bool $compat true if compatibility mode is on
 	 */
 	public function SetCompat($compat)
@@ -64,12 +44,8 @@
 	}
 
 	/**
-	 * GetSkipFallback
+	 * Gets the threshold at which log skips will fallback on the git executable
 	 *
-	 * Gets the threshold at which log skips will fallback on
-	 * the git executable
-	 *
-	 * @access public
 	 * @return int skip fallback number
 	 */
 	public function GetSkipFallback()
@@ -78,12 +54,8 @@
 	}
 
 	/**
-	 * SetSkipFallback
+	 * Sets the threshold at which log skips will fallback on the git executable
 	 *
-	 * Sets the threshold at which log skips will fallback on
-	 * the git executable
-	 *
-	 * @access public
 	 * @param int $skip skip fallback number
 	 */
 	public function SetSkipFallback($skip)
@@ -92,11 +64,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Loads the data for this log
-	 *
-	 * @access protected
 	 */
 	protected function LoadData()
 	{
@@ -110,13 +78,11 @@
 	}
 
 	/**
-	 * RawLog
+	 * Loads the log using raw git objects
 	 *
-	 * Loads the log using raw git objects
 	 * Based on history walking code from glip
 	 *
-	 * @access private
-	 * @return array array of hashes
+	 * @return string[] array of hashes
 	 */
 	private function RawLog()
 	{
@@ -173,11 +139,8 @@
 	}
 
 	/**
-	 * FilterOldCommits
-	 *
 	 * Filters out commits older than a certain age
 	 *
-	 * @access public
 	 * @param int $age age in seconds
 	 * @param int $min minimum number of commits to retain
 	 */

--- a/include/git/Pack.class.php
+++ b/include/git/Pack.class.php
@@ -1,8 +1,7 @@
 <?php
 /**
- * GitPHP Pack
+ * Extracts data from a pack
  *
- * Extracts data from a pack
  * Based on code from Glip by Patrik Fimml
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -10,60 +9,65 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Pack class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Pack
 {
 
+	/**
+	 * Commit object type
+	 */
 	const OBJ_COMMIT = 1;
+
+	/**
+	 * Tree object type
+	 */
 	const OBJ_TREE = 2;
+
+	/**
+	 * Blob object type
+	 */
 	const OBJ_BLOB = 3;
+
+	/**
+	 * Tag object type
+	 */
 	const OBJ_TAG = 4;
+
+	/**
+	 * Offset delta object type
+	 */
 	const OBJ_OFS_DELTA = 6;
+
+	/**
+	 * Ref delta object type
+	 */
 	const OBJ_REF_DELTA = 7;
 
 	/**
-	 * project
-	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * hash
-	 *
-	 * Stores the hash of the pack
-	 *
-	 * @access protected
+	 * The hash of the pack
+	 *
+	 * @var string
 	 */
 	protected $hash;
 
 	/**
-	 * offsetCache
-	 *
 	 * Caches object offsets
 	 *
-	 * @access protected
+	 * @var array
 	 */
 	protected $offsetCache = array();
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash pack hash
-	 * @return mixed pack object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -82,12 +86,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -95,11 +96,8 @@
 	}
 
 	/**
-	 * GetHash
-	 *
 	 * Gets the hash
 	 *
-	 * @access public
 	 * @return string object hash
 	 */
 	public function GetHash()
@@ -108,11 +106,8 @@
 	}
 
 	/**
-	 * ContainsObject
-	 *
 	 * Checks if an object exists in the pack
 	 *
-	 * @access public
 	 * @param string $hash object hash
 	 * @return boolean true if object is in pack
 	 */
@@ -126,13 +121,10 @@
 	}
 
 	/**
-	 * FindPackedObject
-	 *
 	 * Searches for an object's offset in the index
 	 *
 	 * @return int offset
 	 * @param string $hash hash
-	 * @access private
 	 */
 	private function FindPackedObject($hash)
 	{
@@ -167,11 +159,8 @@
 	}
 
 	/**
-	 * SearchIndexV1
-	 *
 	 * Seraches a version 1 index for a hash
 	 *
-	 * @access private
 	 * @param resource $index file pointer to index
 	 * @param string $hash hash to find
 	 * @return int pack offset if found
@@ -225,11 +214,8 @@
 	}
 
 	/**
-	 * SearchIndexV2
-	 *
 	 * Seraches a version 2 index for a hash
 	 *
-	 * @access private
 	 * @param resource $index file pointer to index
 	 * @param string $hash hash to find
 	 * @return int pack offset if found
@@ -300,12 +286,8 @@
 	}
 
 	/**
-	 * ReadFanout
-	 *
-	 * Finds the start/end index a hash will be located between,
-	 * acconding to the fanout table
-	 *
-	 * @access private 
+	 * Finds the start/end index a hash will be located between, acconding to the fanout table
+	 *
 	 * @param resource $index index file pointer
 	 * @param string $binaryHash binary encoded hash to find
 	 * @param int $offset offset in the index file where the fanout table is located
@@ -333,14 +315,11 @@
 	}
 
 	/**
-	 * GetObject
-	 *
 	 * Extracts an object from the pack
 	 *
-	 * @access public
 	 * @param string $hash hash of object to extract
 	 * @param int $type output parameter, returns the type of the object
-	 * @return string object content, or false if not found
+	 * @return string|boolean object content, or false if not found
 	 */
 	public function GetObject($hash, &$type = 0)
 	{
@@ -368,11 +347,8 @@
 	}
 
 	/**
-	 * UnpackObject
-	 *
 	 * Extracts an object at an offset
 	 *
-	 * @access private
 	 * @param resource $pack pack file pointer
 	 * @param int $offset object offset
 	 * @return array object type and data
@@ -466,12 +442,8 @@
 	}
 
 	/**
-	 * ApplyDelta
-	 *
 	 * Applies a binary delta to a base object
 	 *
-	 * @static
-	 * @access private
 	 * @param string $delta delta string
 	 * @param string $base base object data
 	 * @return string patched content
@@ -510,11 +482,8 @@
 	}
 
 	/**
-	 * FindHashes
-	 *
 	 * Find hashes in packfile matching a prefix
 	 *
-	 * @access public
 	 * @param string $prefix hash prefix
 	 * @return array matching hashes
 	 */
@@ -550,11 +519,8 @@
 	}
 
 	/**
-	 * FindHashesV1
-	 *
 	 * Find hashes in v1 index matching a prefix
 	 *
-	 * @access private
 	 * @param resource $index file pointer to index
 	 * @param string $prefix hash prefix
 	 * @return array matching hashes
@@ -589,11 +555,8 @@
 	}
 
 	/**
-	 * FindHashesV2
-	 *
 	 * Find hashes in v2 index matching a prefix
 	 *
-	 * @access private
 	 * @param resource $index file pointer to index
 	 * @param string $prefix hash prefix
 	 * @return array matching hashes
@@ -624,7 +587,7 @@
 	}
 
 	/**
-	 * ParseVarInt
+	 * Read a git packed variable length int
 	 *
 	 * Reads a git-style packed variable length integer
 	 * sequence of bytes, where each byte's 7 less significant bits
@@ -632,8 +595,6 @@
 	 * the most significant bit of each byte is a flag whether to continue
 	 * reading bytes or not
 	 *
-	 * @access private
-	 * @static
 	 * @param string $str packed data string
 	 * @param int $pos position in string to read from
 	 * @return int parsed integer
@@ -650,12 +611,8 @@
 	}
 
 	/**
-	 * uint32
-	 *
 	 * Unpacks a packed 32 bit integer
 	 *
-	 * @static
-	 * @access private
 	 * @return int integer
 	 * @param string $str binary data
 	 */
@@ -666,12 +623,8 @@
 	}
 
 	/**
-	 * fuint32
-	 *
 	 * Reads and unpacks the next 32 bit integer
 	 *
-	 * @static
-	 * @access private
 	 * @return int integer
 	 * @param resource $handle file handle
 	 */

--- a/include/git/Pagination.interface.php
+++ b/include/git/Pagination.interface.php
@@ -1,27 +1,40 @@
 <?php
 /**
- * GitPHP Pagination
- *
- * Interface for collections that can be paginated
- * with a skip and count
+ * Interface for collections that can be paginated with a skip and count
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2012 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Pagination interface
- *
- * @package GitPHP
- * @subpackage Git
- */
 interface GitPHP_Pagination_Interface
 {
+	/**
+	 * Gets the limit
+	 *
+	 * @return int limit
+	 */
 	public function GetLimit();
+
+	/**
+	 * Sets the limit
+	 *
+	 * @param int $limit limit
+	 */
 	public function SetLimit($limit);
+
+	/**
+	 * Gets the skip number
+	 *
+	 * @return int skip number
+	 */
 	public function GetSkip();
+
+	/**
+	 * Sets the skip number
+	 *
+	 * @param int $skip skip number
+	 */
 	public function SetSkip($skip);
 }
 

--- a/include/git/Project.class.php
+++ b/include/git/Project.class.php
@@ -1,63 +1,49 @@
 <?php
 /**
- * GitPHP Project
- * 
- * Represents a single git project
+ * Constant for default minimum abbreviated hash length
+ */
+define('GITPHP_ABBREV_HASH_MIN', 7);
+
+/**
+ * Class for a single git project
  *
  * @author Christopher Han <xiphux@gmail.com>
  * @copyright Copyright (c) 2010 Christopher Han
  * @package GitPHP
  * @subpackage Git
  */
-
-define('GITPHP_ABBREV_HASH_MIN', 7);
-
-/**
- * Project class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Project
 {
 
 /* internal variables {{{1*/
 
 	/**
-	 * projectRoot
-	 *
-	 * Stores the project root internally
-	 *
-	 * @access protected
+	 * The project root
+	 *
+	 * @var string
 	 */
 	protected $projectRoot;
 
 	/**
-	 * project
-	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var string
 	 */
 	protected $project;
 
 /* owner internal variables {{{2*/
 
 	/**
-	 * owner
-	 *
-	 * Stores the owner internally
-	 *
-	 * @access protected
+	 * The owner
+	 *
+	 * @var string
 	 */
 	protected $owner = "";
 
 	/**
-	 * ownerRead
-	 *
-	 * Stores whether the file owner has been read
-	 *
-	 * @access protected
+	 * Whether the project owner has been read
+	 *
+	 * @var boolean
 	 */
 	protected $ownerRead = false;
 
@@ -66,52 +52,41 @@
 /* description internal variables {{{2*/
 
 	/**
-	 * description
-	 *
-	 * Stores the description internally
-	 *
-	 * @access protected
+	 * The description
+	 *
+	 * @var string
 	 */
 	protected $description;
 
 	/**
-	 * readDescription
-	 *
-	 * Stores whether the description has been
-	 * read from the file yet
-	 *
-	 * @access protected
+	 * Whether the description has been read from the file yet
+	 *
+	 * @var boolean
 	 */
 	protected $readDescription = false;
 
 /*}}}2*/
 
 	/**
-	 * category
-	 *
-	 * Stores the category internally
-	 *
-	 * @access protected
+	 * The category
+	 *
+	 * @var string
 	 */
 	protected $category = '';
 
 /* epoch internal variables {{{2*/
 
 	/**
-	 * epoch
-	 *
-	 * Stores the project epoch internally
-	 *
-	 * @access protected
+	 * The project epoch
+	 *
+	 * @var int
 	 */
 	protected $epoch;
 
 	/**
-	 * epochRead
-	 *
-	 * Stores whether the project epoch has been read yet
-	 *
-	 * @access protected
+	 * Whether the project epoch has been read yet
+	 *
+	 * @var boolean
 	 */
 	protected $epochRead = false;
 
@@ -120,20 +95,16 @@
 /* HEAD internal variables {{{2*/
 
 	/**
-	 * head
-	 *
-	 * Stores the head hash internally
-	 *
-	 * @access protected
+	 * The HEAD hash
+	 *
+	 * @var string
 	 */
 	protected $head;
 
 	/**
-	 * readHeadRef
-	 *
-	 * Stores whether the head ref has been read yet
-	 *
-	 * @access protected
+	 * Whether the head ref has been read yet
+	 *
+	 * @var boolean
 	 */
 	protected $readHeadRef = false;
 
@@ -142,20 +113,16 @@
 /* ref internal variables {{{2*/
 
 	/**
-	 * headList
-	 *
-	 * Stores the head list for the project
-	 *
-	 * @access protected
+	 * The head list for the project
+	 *
+	 * @var GitPHP_HeadList
 	 */
 	protected $headList;
 
 	/**
-	 * tagList
-	 *
-	 * Stores the tag list for the project
-	 *
-	 * @access protected
+	 * The tag list for the project
+	 *
+	 * @var GitPHP_TagList
 	 */
 	protected $tagList;
 
@@ -164,20 +131,16 @@
 /* url internal variables {{{2*/
 
 	/**
-	 * cloneUrl
-	 *
-	 * Stores the clone url internally
-	 *
-	 * @access protected
+	 * The clone url
+	 *
+	 * @var string
 	 */
 	protected $cloneUrl = null;
 
 	/**
-	 * pushUrl
-	 *
-	 * Stores the push url internally
-	 *
-	 * @access protected
+	 * The push url
+	 *
+	 * @var string
 	 */
 	protected $pushUrl = null;
 
@@ -186,72 +149,57 @@
 /* bugtracker internal variables {{{2*/
 
 	/**
-	 * bugUrl
-	 *
-	 * Stores the bug url internally
-	 *
-	 * @access protected
+	 * The bug url
+	 *
+	 * @var string
 	 */
 	protected $bugUrl = null;
 
 	/**
-	 * bugPattern
-	 *
-	 * Stores the bug pattern internally
-	 *
-	 * @access protected
+	 * The bug pattern
+	 *
+	 * @var string
 	 */
 	protected $bugPattern = null;
 
 /*}}}2*/
 
 	/**
-	 * website
-	 *
-	 * Stores the website url internally
-	 *
-	 * @access protected
+	 * The website url
+	 *
+	 * @var string
 	 */
 	protected $website = null;
 
 	/**
-	 * compat
-	 *
-	 * Stores whether this project is running
-	 * in compatibility mode
-	 *
-	 * @access protected
+	 * Stores whether this project is running in compatibility mode
+	 *
+	 * @var boolean
 	 */
 	protected $compat = false;
 
 /* hash abbreviation variables {{{2*/
 
 	/**
-	 * abbreviateLength
-	 *
-	 * Stores the hash abbreviation length internally
-	 *
-	 * @access protected
+	 * The hash abbreviation length
+	 *
+	 * @var int
 	 */
 	protected $abbreviateLength = null;
 
 	/**
-	 * uniqueAbbreviation
-	 *
-	 * Stores whether hashes should be guaranteed unique
-	 *
-	 * @access protected
+	 * Whether hashes should be guaranteed unique
+	 *
+	 * @var boolean
 	 */
 	protected $uniqueAbbreviation = false;
 
 /*}}}2*/
 
 	/**
-	 * objectLoader
-	 *
-	 * Stores the raw git object loader
-	 *
-	 * @access protected
+	 * The raw git object loader
+	 *
+	 * @var GitPHP_GitObjectLoader
 	 */
 	protected $objectLoader;
 
@@ -260,14 +208,10 @@
 /* class methods {{{1*/
 
 	/**
-	 * __construct
-	 *
 	 * Class constructor
 	 *
-	 * @access public
 	 * @param string $projectRoot project root
 	 * @param string $project project
-	 * @throws Exception if project is invalid or outside of projectroot
 	 */
 	public function __construct($projectRoot, $project)
 	{
@@ -282,8 +226,6 @@
 /* project accessors {{{2*/
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
 	 * @access public
@@ -295,11 +237,9 @@
 	}
 
 	/**
-	 * SetProject
-	 *
 	 * Attempts to set the project
 	 *
-	 * @access private
+	 * @param string $project the project
 	 * @throws Exception if project is invalid or outside of projectroot
 	 */
 	private function SetProject($project)
@@ -333,11 +273,8 @@
 /*}}}2*/
 
 	/**
-	 * GetSlug
-	 *
 	 * Gets the project as a filename/url friendly slug
 	 *
-	 * @access public
 	 * @return string the slug
 	 */
 	public function GetSlug()
@@ -351,11 +288,8 @@
 	}
 
 	/**
-	 * GetPath
-	 *
 	 * Gets the full project path
 	 *
-	 * @access public
 	 * @return string project path
 	 */
 	public function GetPath()
@@ -366,11 +300,8 @@
 /* owner accessors {{{2 */
 
 	/**
-	 * GetOwner
-	 *
 	 * Gets the project's owner
 	 *
-	 * @access public
 	 * @return string project owner
 	 */
 	public function GetOwner()
@@ -383,11 +314,7 @@
 	}
 
 	/**
-	 * ReadOwner
-	 *
 	 * Reads the project owner
-	 *
-	 * @access protected
 	 */
 	protected function ReadOwner()
 	{
@@ -407,11 +334,8 @@
 	}
 
 	/**
-	 * SetOwner
-	 *
 	 * Sets the project's owner (from an external source)
 	 *
-	 * @access public
 	 * @param string $owner the owner
 	 */
 	public function SetOwner($owner)
@@ -424,11 +348,8 @@
 /* projectroot accessors {{{2*/
 
 	/**
-	 * GetProjectRoot
-	 *
 	 * Gets the project root
 	 *
-	 * @access public
 	 * @return string the project root
 	 */
 	public function GetProjectRoot()
@@ -441,11 +362,8 @@
 /* description accessors {{{2*/
 
 	/**
-	 * GetDescription
-	 *
 	 * Gets the project description
 	 *
-	 * @access public
 	 * @param $trim length to trim description to (0 for no trim)
 	 * @return string project description
 	 */
@@ -466,11 +384,8 @@
 	}
 
 	/**
-	 * SetDescription
-	 *
 	 * Overrides the project description
 	 *
-	 * @access public
 	 * @param string $descr description
 	 */
 	public function SetDescription($descr)
@@ -482,11 +397,8 @@
 /*}}}2*/
 
 	/**
-	 * GetDaemonEnabled
-	 *
 	 * Returns whether gitdaemon is allowed for this project
 	 *
-	 * @access public
 	 * @return boolean git-daemon-export-ok?
 	 */
 	public function GetDaemonEnabled()
@@ -497,11 +409,8 @@
 /* category accessors {{{2*/
 
 	/**
-	 * GetCategory
-	 *
 	 * Gets the project's category
 	 *
-	 * @access public
 	 * @return string category
 	 */
 	public function GetCategory()
@@ -514,11 +423,8 @@
 	}
 
 	/**
-	 * SetCategory
-	 * 
 	 * Sets the project's category
 	 *
-	 * @access public
 	 * @param string $category category
 	 */
 	public function SetCategory($category)
@@ -531,11 +437,8 @@
 /* clone url accessors {{{2*/
 
 	/**
-	 * GetCloneUrl
-	 *
 	 * Gets the clone URL for this repository, if specified
 	 *
-	 * @access public
 	 * @return string clone url
 	 */
 	public function GetCloneUrl()
@@ -544,11 +447,8 @@
 	}
 
 	/**
-	 * SetCloneUrl
-	 *
 	 * Overrides the clone URL for this repository
 	 *
-	 * @access public
 	 * @param string $cUrl clone url
 	 */
 	public function SetCloneUrl($cUrl)
@@ -561,11 +461,8 @@
 /* push url accessors {{{2*/
 
 	/**
-	 * GetPushUrl
-	 *
 	 * Gets the push URL for this repository, if specified
 	 *
-	 * @access public
 	 * @return string push url
 	 */
 	public function GetPushUrl()
@@ -574,11 +471,8 @@
 	}
 
 	/**
-	 * SetPushUrl
-	 *
 	 * Overrides the push URL for this repository
 	 *
-	 * @access public
 	 * @param string $pUrl push url
 	 */
 	public function SetPushUrl($pUrl)
@@ -591,11 +485,8 @@
 /* bugtracker accessors {{{2*/
 
 	/**
-	 * GetBugUrl
-	 *
 	 * Gets the bug URL for this repository, if specified
 	 *
-	 * @access public
 	 * @return string bug url
 	 */
 	public function GetBugUrl()
@@ -604,11 +495,8 @@
 	}
 
 	/**
-	 * SetBugUrl
-	 *
 	 * Overrides the bug URL for this repository
 	 *
-	 * @access public
 	 * @param string $bUrl bug url
 	 */
 	public function SetBugUrl($bUrl)
@@ -617,11 +505,8 @@
 	}
 
 	/**
-	 * GetBugPattern
-	 *
 	 * Gets the bug pattern for this repository, if specified
 	 *
-	 * @access public
 	 * @return string bug pattern
 	 */
 	public function GetBugPattern()
@@ -630,11 +515,8 @@
 	}
 
 	/**
-	 * SetBugPattern
-	 *
 	 * Overrides the bug pattern for this repository
 	 *
-	 * @access public
 	 * @param string $bPat bug pattern
 	 */
 	public function SetBugPattern($bPat)
@@ -647,11 +529,8 @@
 /* website accessors {{{2*/
 
 	/**
-	 * GetWebsite
-	 *
 	 * Gets the website for this repository, if specified
 	 *
-	 * @access public
 	 * @return string website
 	 */
 	public function GetWebsite()
@@ -664,11 +543,8 @@
 	}
 
 	/**
-	 * SetWebsite
-	 *
 	 * Sets the website for this repository
 	 *
-	 * @access public
 	 * @param string $site website
 	 */
 	public function SetWebsite($site)
@@ -681,13 +557,11 @@
 /* HEAD accessors {{{2*/
 
 	/**
-	 * GetHeadCommit
-	 *
 	 * Gets the head commit for this project
+	 *
 	 * Shortcut for getting the tip commit of the HEAD branch
 	 *
-	 * @access public
-	 * @return mixed head commit
+	 * @return GitPHP_Commit head commit
 	 */
 	public function GetHeadCommit()
 	{
@@ -698,11 +572,7 @@
 	}
 
 	/**
-	 * ReadHeadCommit
-	 *
 	 * Reads the head commit hash
-	 *
-	 * @access protected
 	 */
 	public function ReadHeadCommit()
 	{
@@ -716,11 +586,7 @@
 	}
 
 	/**
-	 * ReadHeadCommitGit
-	 *
 	 * Read head commit using git executable
-	 *
-	 * @access private
 	 */
 	private function ReadHeadCommitGit()
 	{
@@ -731,11 +597,7 @@
 	}
 
 	/**
-	 * ReadHeadCommitRaw
-	 *
 	 * Read head commit using raw git head pointer
-	 *
-	 * @access private
 	 */
 	private function ReadHeadCommitRaw()
 	{
@@ -757,12 +619,8 @@
 /* epoch accessors {{{2*/
 
 	/**
-	 * GetEpoch
-	 *
-	 * Gets this project's epoch
-	 * (time of last change)
-	 *
-	 * @access public
+	 * Gets this project's epoch (time of last change)
+	 *
 	 * @return integer timestamp
 	 */
 	public function GetEpoch()
@@ -774,12 +632,8 @@
 	}
 
 	/**
-	 * GetAge
-	 *
-	 * Gets this project's age
-	 * (time since most recent change)
-	 *
-	 * @access public
+	 * Gets this project's age (time since most recent change)
+	 *
 	 * @return integer age
 	 */
 	public function GetAge()
@@ -791,12 +645,7 @@
 	}
 
 	/**
-	 * ReadEpoch
-	 *
-	 * Reads this project's epoch
-	 * (timestamp of most recent change)
-	 *
-	 * @access private
+	 * Reads this project's epoch (timestamp of most recent change)
 	 */
 	private function ReadEpoch()
 	{
@@ -810,11 +659,7 @@
 	}
 
 	/**
-	 * ReadEpochGit
-	 *
 	 * Reads this project's epoch using git executable
-	 *
-	 * @access private
 	 */
 	private function ReadEpochGit()
 	{
@@ -832,11 +677,7 @@
 	}
 
 	/**
-	 * ReadEpochRaw
-	 *
 	 * Reads this project's epoch using raw objects
-	 *
-	 * @access private
 	 */
 	private function ReadEpochRaw()
 	{
@@ -859,11 +700,8 @@
 /* compatibility accessors {{{2*/
 
 	/**
-	 * GetCompat
-	 *
 	 * Gets whether this project is running in compatibility mode
 	 *
-	 * @access public
 	 * @return boolean true if compatibilty mode
 	 */
 	public function GetCompat()
@@ -872,11 +710,8 @@
 	}
 
 	/**
-	 * SetCompat
-	 *
 	 * Sets whether this project is running in compatibility mode
 	 *
-	 * @access public
 	 * @param boolean true if compatibility mode
 	 */
 	public function SetCompat($compat)
@@ -898,11 +733,10 @@
 /* commit loading methods {{{2*/
 
 	/**
-	 * GetCommit
-	 *
 	 * Get a commit for this project
 	 *
-	 * @access public
+	 * @param string $hash commit hash
+	 * @return GitPHP_Commit|null commit object
 	 */
 	public function GetCommit($hash)
 	{
@@ -971,12 +805,9 @@
 /* tag loading methods {{{2*/
 
 	/**
-	 * GetTagList
-	 *
 	 * Gets the tag list
 	 *
-	 * @access public
-	 * @return mixed tag list
+	 * @return GitPHP_TagList tag list
 	 */
 	public function GetTagList()
 	{
@@ -989,13 +820,11 @@
 	}
 
 	/**
-	 * GetTag
-	 *
 	 * Gets a single tag
 	 *
-	 * @access public
 	 * @param string $tag tag to find
-	 * @return mixed tag object
+	 * @param string $hash hash of tag, if known
+	 * @return GitPHP_Tag tag object
 	 */
 	public function GetTag($tag, $hash = '')
 	{
@@ -1028,12 +857,9 @@
 /* head loading methods {{{2*/
 
 	/**
-	 * GetHeadList
-	 *
 	 * Gets the head list
 	 *
-	 * @access public
-	 * @return mixed head list
+	 * @return GitPHP_HeadList head list
 	 */
 	public function GetHeadList()
 	{
@@ -1046,13 +872,11 @@
 	}
 
 	/**
-	 * GetHead
-	 *
 	 * Gets a single head
 	 *
-	 * @access public
 	 * @param string $head head to find
-	 * @return mixed head object
+	 * @param string $hash hash of head, if known
+	 * @return GitPHP_Head head object
 	 */
 	public function GetHead($head, $hash = '')
 	{
@@ -1077,12 +901,10 @@
 /* blob loading methods {{{2*/
 
 	/**
-	 * GetBlob
-	 *
 	 * Gets a blob from this project
 	 *
-	 * @access public
 	 * @param string $hash blob hash
+	 * @return GitPHP_Blob blob object
 	 */
 	public function GetBlob($hash)
 	{
@@ -1115,12 +937,10 @@
 /* tree loading methods {{{2*/
 
 	/**
-	 * GetTree
-	 *
 	 * Gets a tree from this project
 	 *
-	 * @access public
 	 * @param string $hash tree hash
+	 * @return GitPHP_Tree tree object
 	 */
 	public function GetTree($hash)
 	{
@@ -1153,11 +973,10 @@
 /* object loader methods {{{2*/
 
 	/**
-	 * GetObjectLoader
-	 *
 	 * Gets the git object loader for this project
 	 *
 	 * @access public
+	 * @return GitPHP_GitObjectLoader
 	 */
 	public function GetObjectLoader()
 	{
@@ -1173,11 +992,8 @@
 /* hash management methods {{{2*/
 
 	/**
-	 * GetAbbreviateLength
-	 *
 	 * Gets the hash abbreviation length
 	 *
-	 * @access public
 	 * @return int abbreviate length
 	 */
 	public function GetAbbreviateLength()
@@ -1186,11 +1002,8 @@
 	}
 
 	/**
-	 * SetAbbreviateLength
-	 *
 	 * Sets the hash abbreviation length
 	 *
-	 * @access public
 	 * @param int $length abbreviate length
 	 */
 	public function SetAbbreviateLength($length)
@@ -1199,11 +1012,8 @@
 	}
 
 	/**
-	 * GetUniqueAbbreviation
-	 *
 	 * Gets whether abbreviated hashes should be guaranteed unique
 	 *
-	 * @access public
 	 * @return bool true if hashes are guaranteed unique
 	 */
 	public function GetUniqueAbbreviation()
@@ -1212,11 +1022,8 @@
 	}
 
 	/**
-	 * SetUniqueAbbreviation
-	 *
 	 * Sets whether abbreviated hashes should be guaranteed unique
 	 *
-	 * @access public
 	 * @param bool true if hashes should be guaranteed unique
 	 */
 	public function SetUniqueAbbreviation($unique)
@@ -1225,11 +1032,9 @@
 	}
 
 	/**
-	 * AbbreviateHash
-	 *
 	 * Calculates the unique abbreviated hash for a full hash
 	 *
-	 * @param string $hash hash to abbreviate
+	 * @param string $hash full hash
 	 * @return string abbreviated hash
 	 */
 	public function AbbreviateHash($hash)
@@ -1246,8 +1051,6 @@
 	}
 
 	/**
-	 * AbbreviateHashGit
-	 *
 	 * Abbreviates a hash using the git executable
 	 *
 	 * @param string $hash hash to abbreviate
@@ -1276,8 +1079,6 @@
 	}
 
 	/**
-	 * AbbreviateHashRaw
-	 *
 	 * Abbreviates a hash using raw git objects
 	 *
 	 * @param string $hash hash to abbreviate
@@ -1301,8 +1102,6 @@
 	}
 
 	/**
-	 * ExpandHash
-	 *
 	 * Finds the full hash for an abbreviated hash
 	 *
 	 * @param string $abbrevHash abbreviated hash
@@ -1322,8 +1121,6 @@
 	}
 
 	/**
-	 * ExpandHashGit
-	 *
 	 * Expands a hash using the git executable
 	 *
 	 * @param string $abbrevHash
@@ -1358,14 +1155,10 @@
 /* static utilities {{{1*/
 
 	/**
-	 * CompareProject
-	 *
 	 * Compares two projects by project name
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first project
-	 * @param mixed $b second project
+	 * @param GitPHP_Project $a first project
+	 * @param GitPHP_Project $b second project
 	 * @return integer comparison result
 	 */
 	public static function CompareProject($a, $b)
@@ -1378,14 +1171,10 @@
 	}
 
 	/**
-	 * CompareDescription
-	 *
 	 * Compares two projects by description
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first project
-	 * @param mixed $b second project
+	 * @param GitPHP_Project $a first project
+	 * @param GitPHP_Project $b second project
 	 * @return integer comparison result
 	 */
 	public static function CompareDescription($a, $b)
@@ -1398,14 +1187,10 @@
 	}
 
 	/**
-	 * CompareOwner
-	 *
 	 * Compares two projects by owner
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first project
-	 * @param mixed $b second project
+	 * @param GitPHP_Project $a first project
+	 * @param GitPHP_Project $b second project
 	 * @return integer comparison result
 	 */
 	public static function CompareOwner($a, $b)
@@ -1418,14 +1203,10 @@
 	}
 
 	/**
-	 * CompareAge
-	 *
 	 * Compares two projects by age
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first project
-	 * @param mixed $b second project
+	 * @param GitPHP_Project $a first project
+	 * @param GitPHP_Project $b second project
 	 * @return integer comparison result
 	 */
 	public static function CompareAge($a, $b)

--- a/include/git/Ref.class.php
+++ b/include/git/Ref.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Ref
- *
  * Base class for ref objects
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,46 +7,30 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Git Ref class
- *
- * @package GitPHP
- * @subpackage Git
- */
 abstract class GitPHP_Ref extends GitPHP_GitObject
 {
 	
 	/**
-	 * refName
+	 * The ref name
 	 *
-	 * Stores the ref name
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $refName;
 
 	/**
-	 * refDir
+	 * The ref directory
 	 *
-	 * Stores the ref directory
-	 *
-	 * @access protected
+	 * @var string
 	 */
 	protected $refDir;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates ref
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $refDir the ref directory
 	 * @param string $refName the ref name
 	 * @param string $refHash the ref hash
-	 * @throws Exception if not a valid ref
-	 * @return mixed git ref
 	 */
 	public function __construct($project, $refDir, $refName, $refHash = '')
 	{
@@ -61,11 +43,8 @@
 	}
 
 	/**
-	 * GetHash
-	 *
 	 * Gets the hash for this ref (overrides base)
 	 *
-	 * @access public
 	 * @param boolean $abbreviate true to abbreviate hash
 	 * @return string object hash
 	 */
@@ -78,11 +57,8 @@
 	}
 
 	/**
-	 * FindHash
-	 *
 	 * Looks up the hash for the ref
 	 *
-	 * @access protected
 	 * @throws Exception if hash is not found
 	 */
 	protected function FindHash()
@@ -100,11 +76,8 @@
 	}
 
 	/**
-	 * GetName
-	 *
 	 * Gets the ref name
 	 *
-	 * @access public
 	 * @return string ref name
 	 */
 	public function GetName()
@@ -113,11 +86,8 @@
 	}
 
 	/**
-	 * GetDirectory
-	 *
 	 * Gets the ref directory
 	 *
-	 * @access public
 	 * @return string ref directory
 	 */
 	public function GetDirectory()
@@ -126,11 +96,8 @@
 	}
 
 	/**
-	 * GetRefPath
-	 *
 	 * Gets the path to the ref within the project
 	 *
-	 * @access public
 	 * @return string ref path
 	 */
 	public function GetRefPath()
@@ -139,11 +106,8 @@
 	}
 
 	/**
-	 * GetFullPath
-	 *
 	 * Gets the path to the ref including the project path
 	 *
-	 * @access public
 	 * @return string full ref path
 	 */
 	public function GetFullPath()
@@ -152,12 +116,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{

--- a/include/git/RefList.class.php
+++ b/include/git/RefList.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP RefList
- *
  * Base class representing a list of refs
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,59 +7,40 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * RefList
- *
- * @package GitPHP
- * @subpackage Git
- * @abstract
- */
 abstract class GitPHP_RefList implements Iterator
 {
 	/**
-	 * project
-	 *
-	 * Stores the project
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * compat
-	 *
-	 * Stores whether this list is running in compatbility mode
-	 *
-	 * @access protected
+	 * Whether this list is running in compatbility mode
+	 *
+	 * @var boolean
 	 */
 	protected $compat = false;
 
 	/**
-	 * refs
-	 *
-	 * Stores the refs
-	 *
-	 * @access protected
+	 * The refs
+	 *
+	 * @var array
 	 */
 	protected $refs = array();
 
 	/**
-	 * dataLoaded
-	 *
-	 * Stores whether data has been loaded
-	 *
-	 * @access protected
+	 * Whether data has been loaded
+	 *
+	 * @var boolean
 	 */
 	protected $dataLoaded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 */
 	public function __construct($project)
 	{
@@ -72,12 +51,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -85,11 +61,8 @@
 	}
 
 	/**
-	 * GetCompat
-	 *
 	 * Gets whether this list is running in compatibility mode
 	 *
-	 * @access public
 	 * @return bool true if compatibilty mode
 	 */
 	public function GetCompat()
@@ -98,11 +71,8 @@
 	}
 
 	/**
-	 * SetCompat
-	 *
 	 * Sets whether this list is running in compatibility mode
 	 *
-	 * @access public
 	 * @param bool $compat true if compatibility mode
 	 */
 	public function SetCompat($compat)
@@ -111,21 +81,13 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Loads data for this ref list
-	 * 
-	 * @access protected
-	 * @abstract
 	 */
 	protected abstract function LoadData();
 
 	/**
-	 * ReadRefListGit
-	 *
 	 * Reads the list of refs using the git executable
 	 *
-	 * @access protected
 	 * @param string $type ref type
 	 * @return array array of refs
 	 */
@@ -152,11 +114,8 @@
 	}
 
 	/**
-	 * ReadRefListRaw
-	 *
 	 * Reads the list of refs using the raw git files
 	 *
-	 * @access protected
 	 * @param string $type ref type
 	 * @return array array of refs
 	 */
@@ -203,11 +162,8 @@
 	}
 
 	/**
-	 * GetOrderedRefsGit
-	 *
 	 * Get refs in a specific order using git executable
 	 *
-	 * @access public
 	 * @param string $type type of ref
 	 * @param string $order order to use
 	 * @param int $count limit the number of results
@@ -245,11 +201,9 @@
 	}
 
 	/**
-	 * Exists
-	 *
 	 * Checks if a ref exists
 	 *
-	 * @access public
+	 * @param string $ref ref name
 	 * @return boolean true if exists
 	 */
 	public function Exists($ref)
@@ -261,9 +215,9 @@
 	}
 
 	/**
-	 * rewind
-	 *
 	 * Rewinds the iterator
+	 *
+	 * @return mixed
 	 */
 	function rewind()
 	{
@@ -275,9 +229,9 @@
 	}
 
 	/**
-	 * current
-	 *
-	 * Returns the current revision
+	 * Returns the current ref
+	 *
+	 * @return mixed
 	 */
 	function current()
 	{
@@ -289,9 +243,9 @@
 	}
 
 	/**
-	 * key
-	 *
 	 * Returns the current key
+	 *
+	 * @return mixed
 	 */
 	function key()
 	{
@@ -303,9 +257,9 @@
 	}
 
 	/**
-	 * next
-	 *
 	 * Advance the pointer
+	 *
+	 * @return mixed
 	 */
 	function next()
 	{
@@ -317,9 +271,9 @@
 	}
 
 	/**
-	 * valid
-	 *
 	 * Test for a valid pointer
+	 *
+	 * @return boolean
 	 */
 	function valid()
 	{

--- a/include/git/RevList.class.php
+++ b/include/git/RevList.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP RevList
- *
  * Base class for a revision list
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,78 +7,55 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * RevList class
- *
- * @package GitPHP
- * @subpackage Git
- * @abstract
- */
 abstract class GitPHP_RevList implements Iterator, GitPHP_Pagination_Interface
 {
 	/**
-	 * project
-	 *
-	 * Stores the project internally
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project = null;
 
 	/**
-	 * hashList
-	 *
-	 * Stores the list of revision hashes
-	 *
-	 * @access protected
+	 * The list of revision hashes
+	 *
+	 * @var string[]
 	 */
 	protected $hashList = array();
 
 	/**
-	 * limit
-	 *
-	 * Stores the limit of objects to load
-	 *
-	 * @access protected
+	 * The limit of objects to load
+	 *
+	 * @var int
 	 */
 	protected $limit = 50;
 
 	/**
-	 * skip
-	 *
-	 * Stores the number of objects to skip
-	 *
-	 * @access protected
+	 * The number of objects to skip
+	 *
+	 * @var int
 	 */
 	protected $skip = 0;
 
 	/**
-	 * hash
-	 *
-	 * Stores the hash to walk back from
-	 *
-	 * @access protected
+	 * The hash to walk back from
+	 *
+	 * @var string
 	 */
 	protected $hash = false;
 
 	/**
-	 * dataLoaded
-	 *
-	 * Stores whether data has been loaded
-	 *
-	 * @access protected
+	 * Whether data has been loaded
+	 *
+	 * @var boolean
 	 */
 	protected $dataLoaded = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
-	 * @param mixed $head head to walk back from
+	 * @param GitPHP_Project $project project
+	 * @param GitPHP_Commit $head head to walk back from
 	 * @param int $limit limit of revisions to walk
 	 * @param int $skip number of revisions to skip
 	 */
@@ -102,11 +77,8 @@
 	}
 
 	/**
-	 * GetCount
-	 *
 	 * Gets the count
 	 *
-	 * @access public
 	 * @return int count
 	 */
 	public function GetCount()
@@ -119,11 +91,8 @@
 	}
 
 	/**
-	 * GetLimit
-	 *
 	 * Gets the limit
 	 *
-	 * @access public
 	 * @return int limit
 	 */
 	public function GetLimit()
@@ -132,11 +101,8 @@
 	}
 
 	/**
-	 * SetLimit
-	 *
 	 * Sets the limit
 	 *
-	 * @access public
 	 * @param int $limit limit
 	 */
 	public function SetLimit($limit)
@@ -158,11 +124,8 @@
 	}
 
 	/**
-	 * GetSkip
-	 *
 	 * Gets the skip number
 	 *
-	 * @access public
 	 * @return int skip number
 	 */
 	public function GetSkip()
@@ -171,11 +134,8 @@
 	}
 
 	/**
-	 * SetSkip
-	 *
 	 * Sets the skip number
 	 *
-	 * @access public
 	 * @param int $skip skip number
 	 */
 	public function SetSkip($skip)
@@ -191,12 +151,9 @@
 	}
 
 	/**
-	 * GetHead
-	 *
 	 * Gets the head this log will walk from
 	 *
-	 * @access public
-	 * @return mixed head commit
+	 * @return GitPHP_Commit head commit
 	 */
 	public function GetHead()
 	{
@@ -204,12 +161,9 @@
 	}
 
 	/**
-	 * SetHead
-	 *
 	 * Sets the head this log will walk from
 	 *
-	 * @access public
-	 * @param mixed $head head commit
+	 * @param GitPHP_Commit $head head commit
 	 */
 	public function SetHead($head)
 	{
@@ -220,11 +174,8 @@
 	}
 
 	/**
-	 * SetHeadHash
-	 *
 	 * Sets the head hash this log will walk from
 	 *
-	 * @access public
 	 * @param string $hash head commit hash
 	 */
 	public function SetHeadHash($hash)
@@ -239,18 +190,11 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Load the data for this revlist
-	 *
-	 * @access protected
-	 * @abstract
 	 */
 	protected abstract function LoadData();
 
 	/**
-	 * rewind
-	 *
 	 * Rewinds the iterator
 	 */
 	function rewind()
@@ -263,9 +207,9 @@
 	}
 
 	/**
-	 * current
-	 *
 	 * Returns the current revision
+	 *
+	 * @return GitPHP_Commit
 	 */
 	function current()
 	{
@@ -277,8 +221,6 @@
 	}
 
 	/**
-	 * key
-	 *
 	 * Returns the current key
 	 */
 	function key()
@@ -291,8 +233,6 @@
 	}
 
 	/**
-	 * next
-	 *
 	 * Advance the pointer
 	 */
 	function next()
@@ -305,9 +245,9 @@
 	}
 
 	/**
-	 * valid
-	 *
 	 * Test for a valid pointer
+	 *
+	 * @return boolean
 	 */
 	function valid()
 	{
@@ -319,11 +259,7 @@
 	}
 
 	/**
-	 * Clear
-	 *
 	 * Clears the loaded data
-	 *
-	 * @access public
 	 */
 	public function Clear()
 	{
@@ -337,13 +273,10 @@
 	}
 
 	/**
-	 * RevList
-	 *
 	 * Common code for using rev-list command
 	 *
-	 * @access protected
 	 * @param array $args args to give to rev-list
-	 * @return array array of hashes
+	 * @return string[] array of hashes
 	 */
 	protected function RevList($args = array())
 	{

--- a/include/git/Tag.class.php
+++ b/include/git/Tag.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Tag
- *
  * Represents a single tag object
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,99 +7,71 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Tag class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Tag extends GitPHP_Ref
 {
 	
 	/**
-	 * dataRead
-	 *
-	 * Indicates whether data for this tag has been read
-	 *
-	 * @access protected
+	 * Whether data for this tag has been read
+	 *
+	 * @var boolean
 	 */
 	protected $dataRead = false;
 
 	/**
-	 * object
-	 *
-	 * Stores the object internally
-	 *
-	 * @access protected
+	 * The identifier for the tagged object
+	 *
+	 * @var string
 	 */
 	protected $object;
 
 	/**
-	 * commitHash
-	 *
-	 * Stores the commit hash internally
-	 *
-	 * @access protected
+	 * The commit hash
+	 *
+	 * @var string
 	 */
 	protected $commitHash;
 
 	/**
-	 * type
-	 *
-	 * Stores the type internally
-	 *
-	 * @access protected
+	 * The tagged object type
+	 *
+	 * @var string
 	 */
 	protected $type;
 
 	/**
-	 * tagger
-	 *
-	 * Stores the tagger internally
-	 *
-	 * @access protected
+	 * The tagger
+	 *
+	 * @var string
 	 */
 	protected $tagger;
 
 	/**
-	 * taggerEpoch
-	 *
-	 * Stores the tagger epoch internally
-	 *
-	 * @access protected
+	 * The tagger epoch
+	 *
+	 * @var string
 	 */
 	protected $taggerEpoch;
 
 	/**
-	 * taggerTimezone
-	 *
-	 * Stores the tagger timezone internally
-	 *
-	 * @access protected
+	 * The tagger timezone
+	 *
+	 * @var string
 	 */
 	protected $taggerTimezone;
 
 	/**
-	 * comment
-	 *
-	 * Stores the tag comment internally
-	 *
-	 * @access protected
+	 * The tag comment
+	 *
+	 * @var string
 	 */
 	protected $comment = array();
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates tag
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $tag tag name
 	 * @param string $tagHash tag hash
-	 * @return mixed tag object
-	 * @throws Exception exception on invalid tag or hash
 	 */
 	public function __construct($project, $tag, $tagHash = '')
 	{
@@ -109,12 +79,9 @@
 	}
 
 	/**
-	 * GetObject
-	 *
 	 * Gets the object this tag points to
 	 *
-	 * @access public
-	 * @return mixed object for this tag
+	 * @return GitPHP_Commit|GitPHP_Tag|GitPHP_Blob object for this tag
 	 */
 	public function GetObject()
 	{
@@ -133,12 +100,9 @@
 	}
 
 	/**
-	 * GetCommit
-	 *
 	 * Gets the commit this tag points to
 	 *
-	 * @access public
-	 * @return mixed commit for this tag
+	 * @return GitPHP_Commit commit for this tag
 	 */
 	public function GetCommit()
 	{
@@ -162,12 +126,9 @@
 	}
 
 	/**
-	 * SetCommit
-	 *
 	 * Sets the commit this tag points to
 	 *
-	 * @access public
-	 * @param mixed $commit commit object 
+	 * @param GitPHP_Commit $commit commit object 
 	 */
 	public function SetCommit($commit)
 	{
@@ -178,11 +139,8 @@
 	}
 
 	/**
-	 * SetCommitHash
-	 *
 	 * Sets the hash of the commit this tag points to
 	 *
-	 * @access public
 	 * @param string $hash hash
 	 */
 	public function SetCommitHash($hash)
@@ -195,11 +153,8 @@
 	}
 
 	/**
-	 * GetType
-	 *
 	 * Gets the tag type
 	 *
-	 * @access public
 	 * @return string tag type
 	 */
 	public function GetType()
@@ -211,11 +166,8 @@
 	}
 
 	/**
-	 * GetTagger
-	 *
 	 * Gets the tagger
 	 *
-	 * @access public
 	 * @return string tagger
 	 */
 	public function GetTagger()
@@ -227,11 +179,8 @@
 	}
 
 	/**
-	 * GetTaggerEpoch
-	 *
 	 * Gets the tagger epoch
 	 *
-	 * @access public
 	 * @return string tagger epoch
 	 */
 	public function GetTaggerEpoch()
@@ -243,11 +192,8 @@
 	}
 
 	/**
-	 * GetTaggerLocalEpoch
-	 *
 	 * Gets the tagger local epoch
 	 *
-	 * @access public
 	 * @return string tagger local epoch
 	 */
 	public function GetTaggerLocalEpoch()
@@ -262,11 +208,8 @@
 	}
 
 	/**
-	 * GetTaggerTimezone
-	 *
 	 * Gets the tagger timezone
 	 *
-	 * @access public
 	 * @return string tagger timezone
 	 */
 	public function GetTaggerTimezone()
@@ -278,11 +221,8 @@
 	}
 
 	/**
-	 * GetAge
-	 *
 	 * Gets the tag age
 	 *
-	 * @access public
 	 * @return string age
 	 */
 	public function GetAge()
@@ -294,12 +234,9 @@
 	}
 
 	/**
-	 * GetComment
-	 *
 	 * Gets the tag comment
 	 *
-	 * @access public
-	 * @return array comment lines
+	 * @return string[] comment lines
 	 */
 	public function GetComment()
 	{
@@ -310,11 +247,8 @@
 	}
 
 	/**
-	 * LightTag
-	 *
 	 * Tests if this is a light tag (tag without tag object)
 	 *
-	 * @access public
 	 * @return boolean true if tag is light (has no object)
 	 */
 	public function LightTag()
@@ -333,11 +267,7 @@
 	}
 
 	/**
-	 * ReadData
-	 *
 	 * Reads the tag data
-	 *
-	 * @access protected
 	 */
 	protected function ReadData()
 	{
@@ -353,11 +283,7 @@
 	}
 
 	/**
-	 * ReadDataGit
-	 *
 	 * Reads the tag data using the git executable
-	 *
-	 * @access private
 	 */
 	private function ReadDataGit()
 	{
@@ -441,11 +367,7 @@
 	}
 
 	/**
-	 * ReadDataRaw
-	 *
 	 * Reads the tag data using the raw git object
-	 *
-	 * @access private
 	 */
 	private function ReadDataRaw()
 	{
@@ -519,11 +441,7 @@
 	}
 
 	/**
-	 * ReadCommit
-	 *
 	 * Attempts to dereference the commit for this tag
-	 *
-	 * @access private
 	 */
 	private function ReadCommit()
 	{
@@ -546,12 +464,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{
@@ -560,11 +475,8 @@
 	}
 
 	/**
-	 * GetCacheKey
-	 *
 	 * Gets the cache key to use for this object
 	 *
-	 * @access public
 	 * @return string cache key
 	 */
 	public function GetCacheKey()
@@ -573,12 +485,8 @@
 	}
 
 	/**
-	 * GetCreationEpoch
-	 *
-	 * Gets tag's creation epoch
-	 * (tagger epoch, or committer epoch for light tags)
-	 *
-	 * @access public
+	 * Gets tag's creation epoch (tagger epoch, or committer epoch for light tags)
+	 *
 	 * @return string creation epoch
 	 */
 	public function GetCreationEpoch()
@@ -593,14 +501,10 @@
 	}
 
 	/**
-	 * CompareAge
-	 *
 	 * Compares two tags by age
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first tag
-	 * @param mixed $b second tag
+	 * @param GitPHP_Tag $a first tag
+	 * @param GitPHP_Tag $b second tag
 	 * @return integer comparison result
 	 */
 	public static function CompareAge($a, $b)
@@ -621,14 +525,10 @@
 	}
 
 	/**
-	 * CompareCreationEpoch
-	 *
 	 * Compares to tags by creation epoch
 	 *
-	 * @access public
-	 * @static
-	 * @param mixed $a first tag
-	 * @param mixed $b second tag
+	 * @param GitPHP_Tag $a first tag
+	 * @param GitPHP_Tag $b second tag
 	 * @return integer comparison result
 	 */
 	public static function CompareCreationEpoch($a, $b)
@@ -644,12 +544,8 @@
 	}
 
 	/**
-	 * CacheKey
-	 *
 	 * Generates a tag cache key
 	 *
-	 * @access public
-	 * @static
 	 * @param string $proj project
 	 * @param string $tag tag name
 	 * @return string cache key

--- a/include/git/TagList.class.php
+++ b/include/git/TagList.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP TagList
- *
  * Class representing a list of tags
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,22 +7,12 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * TagList
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_TagList extends GitPHP_RefList
 {
 	/**
-	 * GetTags
-	 *
 	 * Gets the tags
 	 *
-	 * @access public
-	 * @return array array of tags
+	 * @return GitPHP_Tag[] array of tags
 	 */
 	public function GetTags()
 	{
@@ -41,11 +29,7 @@
 	}
 
 	/**
-	 * LoadData
-	 *
 	 * Load tag data
-	 *
-	 * @access protected
 	 */
 	protected function LoadData()
 	{
@@ -58,12 +42,10 @@
 	}
 
 	/**
-	 * GetTag
-	 *
 	 * Gets a tag
 	 *
-	 * @access public
 	 * @param string $tag tag
+	 * @return GitPHP_Tag tag object
 	 */
 	public function GetTag($tag)
 	{
@@ -80,14 +62,11 @@
 	}
 
 	/**
-	 * GetOrderedTags
-	 *
 	 * Gets tags in a specific order
 	 *
-	 * @access public
 	 * @param string $order order to use
 	 * @param int $count limit the number of results
-	 * @return array array of tags
+	 * @return GitPHP_Tag[] array of tags
 	 */
 	public function GetOrderedTags($order, $count = 0)
 	{
@@ -109,14 +88,11 @@
 	}
 
 	/**
-	 * GetOrderedTagsRaw
-	 *
 	 * Get tags in a specific order
 	 *
-	 * @access public
 	 * @param string $order order to use
 	 * @param int $count limit the number of results
-	 * @return array array of tags
+	 * @return GitPHP_Tag[] array of tags
 	 */
 	private function GetOrderedTagsRaw($order, $count = 0)
 	{
@@ -137,9 +113,9 @@
 	}
 
 	/**
-	 * current
+	 * Returns the current revision (overrides base)
 	 *
-	 * Returns the current revision (overrides base)
+	 * @return GitPHP_Tag
 	 */
 	function current()
 	{

--- a/include/git/Tree.class.php
+++ b/include/git/Tree.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Tree
- *
  * Represents a single tree
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,71 +7,47 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * Tree class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_Tree extends GitPHP_FilesystemObject
 {
 
 	/**
-	 * contents
-	 *
 	 * Tree contents
 	 *
-	 * @access protected
+	 * @var array
 	 */
 	protected $contents = array();
 
 	/**
-	 * contentsRead
-	 *
-	 * Stores whether contents were read
-	 *
-	 * @access protected
+	 * Whether contents were read
+	 *
+	 * @var boolean
 	 */
 	protected $contentsRead = false;
 
 	/**
-	 * treePaths
-	 *
-	 * Stores tree hash to path mappings
-	 *
-	 * @access protected
+	 * Tree hash to path mappings
+	 *
+	 * @var array
 	 */
 	protected $treePaths = array();
 
 	/**
-	 * blobPaths
-	 *
-	 * Stores blob hash to path mappings
-	 *
-	 * @access protected
+	 * Blob hash to path mappings
+	 *
+	 * @var array
 	 */
 	protected $blobPaths = array();
 
 	/**
-	 * hashPathsRead
-	 *
-	 * Stores whether hash paths have been read
-	 *
-	 * @access protected
+	 * Whether hash paths have been read
 	 */
 	protected $hashPathsRead = false;
 
 	/**
-	 * __construct
-	 *
 	 * Instantiates object
 	 *
-	 * @access public
-	 * @param mixed $project the project
+	 * @param GitPHP_Project $project the project
 	 * @param string $hash tree hash
-	 * @return mixed tree object
-	 * @throws Exception exception on invalid hash
 	 */
 	public function __construct($project, $hash)
 	{
@@ -81,11 +55,8 @@
 	}
 
 	/**
-	 * SetPath
-	 *
 	 * Sets the object path (overrides base)
 	 *
-	 * @access public
 	 * @param string $path object path
 	 */
 	public function SetPath($path)
@@ -103,12 +74,9 @@
 	}
 
 	/**
-	 * GetContents
-	 *
 	 * Gets the tree contents
 	 *
-	 * @access public
-	 * @return array array of objects for contents
+	 * @return (GitPHP_Tree|GitPHP_Blob)[] array of objects for contents
 	 */
 	public function GetContents()
 	{
@@ -164,11 +132,7 @@
 	}
 
 	/**
-	 * ReadContents
-	 *
 	 * Reads the tree contents
-	 *
-	 * @access protected
 	 */
 	protected function ReadContents()
 	{
@@ -184,11 +148,7 @@
 	}
 
 	/**
-	 * ReadContentsGit
-	 *
 	 * Reads the tree contents using the git executable
-	 *
-	 * @access private
 	 */
 	private function ReadContentsGit()
 	{
@@ -241,11 +201,7 @@
 	}
 
 	/**
-	 * ReadContentsRaw
-	 *
 	 * Reads the tree contents using the raw git object
-	 *
-	 * @access private
 	 */
 	private function ReadContentsRaw()
 	{
@@ -289,11 +245,9 @@
 	}
 
 	/**
-	 * GetTreePaths
-	 *
 	 * Gets tree paths mapped to hashes
 	 *
-	 * @access public
+	 * @return array
 	 */
 	public function GetTreePaths()
 	{
@@ -304,11 +258,9 @@
 	}
 
 	/**
-	 * GetBlobPaths
-	 *
 	 * Gets blob paths mapped to hashes
 	 *
-	 * @access public
+	 * @return array
 	 */
 	public function GetBlobPaths()
 	{
@@ -319,11 +271,8 @@
 	}
 
 	/**
-	 * PathToHash
-	 *
 	 * Given a filepath, get its hash
 	 *
-	 * @access public
 	 * @param string $path path
 	 * @return string hash
 	 */
@@ -347,11 +296,7 @@
 	}
 
 	/**
-	 * ReadHashPaths
-	 *
 	 * Read hash to path mappings
-	 *
-	 * @access private
 	 */
 	private function ReadHashPaths()
 	{
@@ -361,11 +306,7 @@
 	}
 
 	/**
-	 * ReadHashPathsGit
-	 *
 	 * Reads hash to path mappings using git exe
-	 *
-	 * @access private
 	 */
 	private function ReadHashPathsGit()
 	{
@@ -392,12 +333,9 @@
 	}
 
 	/**
-	 * __sleep
-	 *
 	 * Called to prepare the object for serialization
 	 *
-	 * @access public
-	 * @return array list of properties to serialize
+	 * @return string[] list of properties to serialize
 	 */
 	public function __sleep()
 	{
@@ -406,11 +344,8 @@
 	}
 
 	/**
-	 * GetCacheKey
-	 *
 	 * Gets the cache key to use for this object
 	 *
-	 * @access public
 	 * @return string cache key
 	 */
 	public function GetCacheKey()
@@ -419,12 +354,8 @@
 	}
 
 	/**
-	 * CacheKey
-	 *
 	 * Generates a tree cache key
 	 *
-	 * @access public
-	 * @static
 	 * @param string $proj project
 	 * @param string $hash hash
 	 * @return string cache key

--- a/include/git/TreeDiff.class.php
+++ b/include/git/TreeDiff.class.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * GitPHP Tree Diff
- *
  * Represents differences between two commit trees
  *
  * @author Christopher Han <xiphux@gmail.com>
@@ -9,82 +7,58 @@
  * @package GitPHP
  * @subpackage Git
  */
-
-/**
- * TreeDiff class
- *
- * @package GitPHP
- * @subpackage Git
- */
 class GitPHP_TreeDiff implements Iterator
 {
 	
 	/**
-	 * fromHash
-	 *
-	 * Stores the from hash
-	 *
-	 * @access protected
+	 * The from tree hash
+	 *
+	 * @var string
 	 */
 	protected $fromHash;
 
 	/**
-	 * toHash
-	 *
-	 * Stores the to hash
-	 *
-	 * @access protected
+	 * The to tree hash
+	 *
+	 * @var string
 	 */
 	protected $toHash;
 
 	/**
-	 * renames
-	 *
-	 * Stores whether to detect renames
-	 *
-	 * @access protected
+	 * Whether to detect renames
+	 *
+	 * @var boolean
 	 */
 	protected $renames;
 
 	/**
-	 * project
-	 *
-	 * Stores the project
-	 *
-	 * @access protected
+	 * The project
+	 *
+	 * @var GitPHP_Project
 	 */
 	protected $project;
 
 	/**
-	 * fileDiffs
-	 *
-	 * Stores the individual file diffs
-	 *
-	 * @access protected
+	 * The individual file diffs
+	 *
+	 * @var GitPHP_FileDiff[]
 	 */
 	protected $fileDiffs = array();
 
 	/**
-	 * dataRead
-	 *
-	 * Stores whether data has been read
-	 *
-	 * @access protected
+	 * Whether data has been read
+	 *
+	 * @var boolean
 	 */
 	protected $dataRead = false;
 
 	/**
-	 * __construct
-	 *
 	 * Constructor
 	 *
-	 * @access public
-	 * @param mixed $project project
+	 * @param GitPHP_Project $project project
 	 * @param string $toHash to commit hash
 	 * @param string $fromHash from commit hash
 	 * @param boolean $renames whether to detect file renames
-	 * @return mixed TreeDiff object
-	 * @throws Exception exception on invalid parameters
 	 */
 	public function __construct($project, $toHash, $fromHash = '', $renames = false)
 	{
@@ -106,12 +80,9 @@
 	}
 
 	/**
-	 * GetProject
-	 *
 	 * Gets the project
 	 *
-	 * @access public
-	 * @return mixed project
+	 * @return GitPHP_Project project
 	 */
 	public function GetProject()
 	{
@@ -119,11 +90,7 @@
 	}
 
 	/**
-	 * ReadData
-	 *
 	 * Reads the tree diff data
-	 *
-	 * @access private
 	 */
 	private function ReadData()
 	{
@@ -157,11 +124,8 @@
 	}
 
 	/**
-	 * GetFromHash
-	 *
 	 * Gets the from hash for this treediff
 	 *
-	 * @access public
 	 * @return string from hash
 	 */
 	public function GetFromHash()
@@ -170,11 +134,8 @@
 	}
 
 	/**
-	 * GetToHash
-	 *
 	 * Gets the to hash for this treediff
 	 *
-	 * @access public
 	 * @return string to hash
 	 */
 	public function GetToHash()
@@ -183,11 +144,8 @@
 	}
 
 	/**
-	 * GetRenames
-	 *
 	 * Get whether this treediff is set to detect renames
 	 *
-	 * @access public
 	 * @return boolean true if renames will be detected
 	 */
 	public function GetRenames()
@@ -196,11 +154,8 @@
 	}
 
 	/**
-	 * SetRenames
-	 *
 	 * Set whether this treediff is set to detect renames
 	 *
-	 * @access public
 	 * @param boolean $renames whether to detect renames
 	 */
 	public function SetRenames($renames)
@@ -213,9 +168,9 @@
 	}
 
 	/**
-	 * rewind
-	 *
 	 * Rewinds the iterator
+	 *
+	 * @return GitPHP_FileDiff
 	 */
 	function rewind()
 	{
@@ -226,9 +181,9 @@
 	}
 
 	/**
-	 * current
-	 *
 	 * Returns the current element in the array
+	 *
+	 * @return GitPHP_FileDiff
 	 */
 	function current()
 	{
@@ -239,9 +194,9 @@
 	}
 
 	/**
-	 * key
-	 *
 	 * Returns the current key
+	 *
+	 * @return int
 	 */
 	function key()
 	{
@@ -252,9 +207,9 @@
 	}
 
 	/**
-	 * next
-	 *
 	 * Advance the pointer
+	 *
+	 * @return GitPHP_FileDiff
 	 */
 	function next()
 	{
@@ -265,9 +220,9 @@
 	}
 
 	/**
-	 * valid
-	 *
 	 * Test for a valid pointer
+	 *
+	 * @return boolean
 	 */
 	function valid()
 	{
@@ -278,8 +233,6 @@
 	}
 
 	/**
-	 * Count
-	 *
 	 * Gets the number of file changes in this treediff
 	 *
 	 * @access public

comments