diff --git a/lib/Doctrine/ODM/PHPCR/Document/Generic.php b/lib/Doctrine/ODM/PHPCR/Document/Generic.php
index 9e1ce2e6a..11c844bd0 100644
--- a/lib/Doctrine/ODM/PHPCR/Document/Generic.php
+++ b/lib/Doctrine/ODM/PHPCR/Document/Generic.php
@@ -168,4 +168,9 @@ public function addReferrer($referrer)
 
         $this->referrers->add($referrer);
     }
+
+    public function __toString()
+    {
+        return $this->nodename;
+    }
 }
diff --git a/lib/Doctrine/ODM/PHPCR/DocumentManager.php b/lib/Doctrine/ODM/PHPCR/DocumentManager.php
index 9edcf7324..40b1e923a 100644
--- a/lib/Doctrine/ODM/PHPCR/DocumentManager.php
+++ b/lib/Doctrine/ODM/PHPCR/DocumentManager.php
@@ -56,7 +56,7 @@ class DocumentManager implements ObjectManager
     private $config;
 
     /**
-     * @var Mapping\ClassMetadataFactory
+     * @var ClassMetadataFactory
      */
     private $metadataFactory;
 
@@ -88,12 +88,12 @@ class DocumentManager implements ObjectManager
     private $closed = false;
 
     /**
-     * @var \Doctrine\ODM\PHPCR\Translation\TranslationStrategy\TranslationStrategyInterface
+     * @var TranslationStrategyInterface
      */
     protected $translationStrategy;
 
     /**
-     * @var \Doctrine\ODM\PHPCR\Translation\LocaleChooser\LocaleChooserInterface
+     * @var LocaleChooserInterface
      */
     protected $localeChooserStrategy;
 
@@ -120,10 +120,12 @@ public function __construct(SessionInterface $session, Configuration $config = n
     /**
      * Add or replace a translation strategy
      *
-     * note that you do not need to set the default strategies attribute and child unless you want to replace them.
+     * Note that you do not need to set the default strategies attribute and
+     * child unless you want to replace them.
      *
      * @param string $key The name of the translation strategy.
-     * @param \Doctrine\ODM\PHPCR\Translation\TranslationStrategy\TranslationStrategyInterface $strategy the strategy that implements this label
+     * @param TranslationStrategyInterface $strategy the strategy that
+     *      is used with this key
      *
      */
     public function setTranslationStrategy($key, TranslationStrategyInterface $strategy)
@@ -138,7 +140,7 @@ public function setTranslationStrategy($key, TranslationStrategyInterface $strat
      *
      * @return Translation\TranslationStrategy\TranslationStrategyInterface
      *
-     * @throws InvalidArgumentException if there is no strategy registered with the given key
+     * @throws \InvalidArgumentException if there is no strategy registered with the given key
      */
     public function getTranslationStrategy($key)
     {
@@ -149,10 +151,10 @@ public function getTranslationStrategy($key)
     }
 
     /**
-     * Get the assigned language chooser strategy. This function considers the document is translatable
-     * and thus must have an injected strategy. So don't call this on non-translatable documents
-     * since it will ALWAYS fail!
-     * @return Translation\LocaleChooser\LocaleChooserInterface
+     * Get the assigned language chooser strategy previously set with
+     * setLocaleChooserStrategy
+     *
+     * @return LocaleChooserInterface
      */
     public function getLocaleChooserStrategy()
     {
@@ -194,6 +196,8 @@ public function getEventManager()
     }
 
     /**
+     * Access the underlying PHPCR session this manager is using.
+     *
      * @return \PHPCR\SessionInterface
      */
     public function getPhpcrSession()
@@ -207,6 +211,7 @@ public function getPhpcrSession()
      * @param SessionInterface $session
      * @param Configuration $config
      * @param EventManager $evm
+     *
      * @return DocumentManager
      */
     public static function create(SessionInterface $session, Configuration $config = null, EventManager $evm = null)
@@ -245,7 +250,7 @@ private function errorIfClosed()
     /**
      * Check if the Document manager is open or closed.
      *
-     * @return bool
+     * @return boolean true if open, false if closed
      */
     public function isOpen()
     {
@@ -253,25 +258,29 @@ public function isOpen()
     }
 
     /**
-     * @param  string $class
-     * @return ClassMetadata
+     * Get the ClassMetadata object for a class
+     *
+     * @param  string $className document class name to get metadata for
+     *
+     * @return \Doctrine\ODM\PHPCR\Mapping\ClassMetadata
      */
-    public function getClassMetadata($class)
+    public function getClassMetadata($className)
     {
-        return $this->metadataFactory->getMetadataFor($class);
+        return $this->metadataFactory->getMetadataFor($className);
     }
 
     /**
      * Find the Document with the given id.
      *
-     * Will return null if the document wasn't found.
+     * Will return null if the document was not found.
      *
-     * If the document is translatable, then the language chooser strategy is used to load the best
-     * suited language for the translatable fields.
+     * If the document is translatable, then the language chooser strategy is
+     * used to load the best * suited language for the translatable fields.
      *
-     * @param null|string $className
-     * @param string $id
-     * @return object
+     * @param null|string $className optional object class name to use
+     * @param string $id the path or uuid of the document to find
+     *
+     * @return object|null the document if found, otherwise null
      */
     public function find($className, $id)
     {
@@ -300,6 +309,7 @@ public function find($className, $id)
      *
      * @param null|string $className
      * @param array $ids
+     *
      * @return object
      */
     public function findMany($className, array $ids)
@@ -311,6 +321,7 @@ public function findMany($className, array $ids)
 
             $tmp = array();
             foreach ($nodes as $node) {
+                /** @var $node \PHPCR\NodeInterface */
                 $tmp[] = $node->getPath();
             }
 
@@ -346,11 +357,12 @@ public function findMany($className, array $ids)
      * Note that this will be the same object as you got with a previous find/findTranslation call - we can't
      * allow copies of objects to exist
      *
-     * @param $className
-     * @param $id
+     * @param null|string $className the class name to find the translation for
+     * @param string $id the identifier of the class (path or uuid)
      * @param string $locale The language to try to load
-     * @param bool $fallback Set to true if the language fallback mechanism should be used
-     * @return object
+     * @param boolean $fallback Set to true if the language fallback mechanism should be used
+     *
+     * @return object the translated document
      */
     public function findTranslation($className, $id, $locale, $fallback = true)
     {
@@ -377,8 +389,11 @@ public function findTranslation($className, $id, $locale, $fallback = true)
     }
 
     /**
-     * @param  string $className
-     * @return Doctrine\ODM\PHPCR\DocumentRepository
+     * Get the repository for the specified class
+     *
+     * @param  string $className The document class name to get the repository for
+     *
+     * @return DocumentRepository
      */
     public function getRepository($className)
     {
@@ -398,10 +413,12 @@ public function getRepository($className)
     /**
      * Quote a string for inclusion in an SQL2 query
      *
-     * @see \PHPCR\PropertyType
      * @param  string $val
      * @param  int $type
+     *
      * @return string
+     *
+     * @see \PHPCR\PropertyType
      */
     public function quote($val, $type = PropertyType::STRING)
     {
@@ -415,9 +432,11 @@ public function quote($val, $type = PropertyType::STRING)
     /**
      * Escape the illegal characters for inclusion in a fulltext statement. Escape Character is \\.
      *
-     * @see http://jackrabbit.apache.org/api/1.4/org/apache/jackrabbit/util/Text.html #escapeIllegalJcrChars
      * @param  string $string
+     *
      * @return string Escaped String
+     *
+     * @see http://jackrabbit.apache.org/api/1.4/org/apache/jackrabbit/util/Text.html #escapeIllegalJcrChars
      */
     public function escapeFullText($string)
     {
@@ -439,7 +458,8 @@ public function escapeFullText($string)
      *
      * @param  string $statement the statement in the specified language
      * @param  string $language the query language
-     * @return PHPCR\Query\QueryInterface
+     *
+     * @return QueryInterface
      */
     public function createQuery($statement, $language)
     {
@@ -464,7 +484,8 @@ public function createQueryBuilder()
     /**
      * Get document results from a PHPCR query instance
      *
-     * @param  \PHPCR\Query\QueryInterface $query the query instance as acquired through createQuery()
+     * @param  \PHPCR\Query\QueryInterface $query the query instance as
+     *      acquired through createQuery()
      * @param  string $documentName document class
      *
      * @return array of document instances
@@ -477,6 +498,7 @@ public function getDocumentsByQuery(QueryInterface $query, $className = null)
 
         $ids = array();
         foreach ($result->getRows() as $row) {
+            /** @var $row \PHPCR\Query\RowInterface */
             $ids[] = $row->getPath();
         }
 
@@ -496,8 +518,13 @@ public function getDocumentsByQuery(QueryInterface $query, $className = null)
      * For translatable documents has to determine the locale:
      *
      *   - If there is a non-empty @Locale that field value is used
-     *   - If the document was previously loaded from the DocumentManager it has a non-empty @Locale
-     *   - Otherwise its a new document. The language chooser strategy is asked for the default language and that is used to store. The field is updated with the locale.
+     *   - If the document was previously loaded from the DocumentManager it
+     *      has a non-empty @Locale
+     *   - Otherwise its a new document. The language chooser strategy is asked
+     *      for the default language and that is used to store. The field is
+     *      updated with the locale.
+     *
+     * @param object $document the document to persist
      */
     public function persist($document)
     {
@@ -615,6 +642,7 @@ public function merge($document)
      * reference it.
      *
      * @param object $document The object to detach.
+     *
      * @return void
      */
     public function detach($document)
@@ -652,10 +680,12 @@ public function refresh($document)
      *
      * This methods gets all child nodes as a collection of documents that matches
      * a given filter (same as PHPCR Node::getNodes)
+     *
      * @param object $document document instance which children should be loaded
      * @param string|array $filter optional filter to filter on childrens names
      * @param integer $fetchDepth optional fetch depth if supported by the PHPCR session
-     * @return a collection of child documents
+     *
+     * @return \Doctrine\Common\Collections\Collection collection of child documents
      */
     public function getChildren($document, $filter = null, $fetchDepth = null)
     {
@@ -672,9 +702,11 @@ public function getChildren($document, $filter = null, $fetchDepth = null)
      *
      * This methods gets all nodes as a collection of documents that refer the
      * given document and matches a given name.
+     *
      * @param object $document document instance which referrers should be loaded
      * @param string|array $name optional name to match on referrers names
-     * @return a collection of referrer documents
+     *
+     * @return \Doctrine\Common\Collections\Collection collection of referrer documents
      */
     public function getReferrers($document, $type = null, $name = null)
     {
@@ -712,6 +744,7 @@ public function flush($document = null)
      *
      * @param string $documentName
      * @param string|object $id
+     *
      * @return mixed|object The document reference.
      */
     public function getReference($documentName, $id)
@@ -858,11 +891,11 @@ public function getAllLinearVersions($document, $limit = -1)
      * @param string $id id of the document
      * @param string $versionName the version name as given by getLinearPredecessors
      *
-     * @return the detached document or null if the document is not found
+     * @return object the detached document or null if the document is not found
      *
-     * @throws InvalidArgumentException if there is a document with $id but no
+     * @throws \InvalidArgumentException if there is a document with $id but no
      *      version with $name
-     * @throws UnsupportedRepositoryOperationException if the implementation
+     * @throws \PHPCR\UnsupportedRepositoryOperationException if the implementation
      *      does not support versioning
      */
     public function findVersionByName($className, $id, $versionName)
@@ -872,8 +905,11 @@ public function findVersionByName($className, $id, $versionName)
     }
 
     /**
+     * Check if this repository contains the object
+     *
      * @param  object $document
-     * @return bool
+     *
+     * @return boolean true if the repository contains the object, false otherwise
      */
     public function contains($document)
     {
@@ -885,6 +921,10 @@ public function contains($document)
     }
 
     /**
+     * Client code should not access the UnitOfWork except in special
+     * circumstances. Methods on UnitOfWork might be changed without special
+     * notice
+     *
      * @return UnitOfWork
      */
     public function getUnitOfWork()
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php
index 0eef54dd1..bb825ed8e 100644
--- a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php
+++ b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadata.php
@@ -85,7 +85,7 @@ class ClassMetadata implements ClassMetadataInterface
     /**
      * READ-ONLY: The ID generator used for generating IDs for this class.
      *
-     * @var AbstractIdGenerator
+     * @var \Doctrine\ODM\PHPCR\Id\IdGenerator
      */
     public $idGenerator = self::GENERATOR_TYPE_ASSIGNED;
 
@@ -202,7 +202,7 @@ class ClassMetadata implements ClassMetadataInterface
     public $associationsMappings = array();
 
     /**
-     * Mapping of child doucments that are child nodes in the repository
+     * Mapping of child documents that are child nodes in the repository
      */
     public $childMappings = array();
 
@@ -449,6 +449,7 @@ public function getReflectionProperties()
      * Gets a ReflectionProperty for a specific field of the mapped class.
      *
      * @param string $name
+     *
      * @return \ReflectionProperty
      */
     public function getReflectionProperty($name)
@@ -1050,8 +1051,11 @@ public function setFieldValue($document, $field, $value)
     /**
      * Gets the specified field's value off the given document.
      *
-     * @param object $document
-     * @param string $field
+     * @param object $document the document to get the field from
+     * @param string $field the name of the field
+     *
+     * @return mixed|null the value of this field for the document or null if
+     *      not found
      */
     public function getFieldValue($document, $field)
     {
@@ -1067,7 +1071,8 @@ public function getFieldValue($document, $field)
      * lifecycle callbacks and lifecycle listeners.
      *
      * @param string $event The lifecycle event.
-     * @param Document $document The Document on which the event occured.
+     * @param object $document The Document on which the event occured.
+     * @param array $arguments the arguments to pass to the callback
      */
     public function invokeLifecycleCallbacks($lifecycleEvent, $document, array $arguments = null)
     {
diff --git a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
index ffa978285..e9bbf6ffd 100644
--- a/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
+++ b/lib/Doctrine/ODM/PHPCR/Mapping/ClassMetadataFactory.php
@@ -117,7 +117,7 @@ protected function getFqcnFromAlias($namespaceAlias, $simpleClassName)
     /**
      * {@inheritdoc}
      */
-    protected function doLoadMetadata($class, $parent, $rootEntityFound)
+    protected function doLoadMetadata($class, $parent, $rootEntityFound, array $nonSuperclassParents)
     {
         if ($parent) {
             $this->addInheritedFields($class, $parent);
diff --git a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
index 00ff5ca77..fe629c8b9 100644
--- a/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
+++ b/lib/Doctrine/ODM/PHPCR/UnitOfWork.php
@@ -171,7 +171,7 @@ class UnitOfWork
     private $session;
 
     /**
-     * @var EventManager
+     * @var \Doctrine\Common\EventManager
      */
     private $evm;
 
@@ -1568,7 +1568,7 @@ private function executeMoves($documents)
 
             // update fields nodename and parentMapping if they exist in this type
             $class = $this->dm->getClassMetadata(get_class($document));
-            $node = $class->getFieldValue($document, $class->node);
+            $node = $this->session->getNode($targetPath); // get node from session, document class might not map it
             if ($class->nodename) {
                 $class->setFieldValue($document, $class->nodename, $node->getName());
             }
@@ -1872,7 +1872,7 @@ public function getDocumentById($id)
      * @param object $document document instance which children should be loaded
      * @param string|array $filter optional filter to filter on children's names
      * @param integer $fetchDepth optional fetch depth if supported by the PHPCR session
-     * @return a collection of child documents
+     * @return Collection a collection of child documents
      */
     public function getChildren($document, $filter = null, $fetchDepth = null)
     {