diff --git a/src/DiDom/Document.php b/src/DiDom/Document.php
index cadedfa..c90649d 100644
--- a/src/DiDom/Document.php
+++ b/src/DiDom/Document.php
@@ -147,7 +147,7 @@ public function has($expression, $type = Query::TYPE_CSS)
      * 
      * @param  string $expression XPath expression or CSS selector
      * @param  string $type the type of the expression
-     * @return array
+     * @return \DiDom\Element[]
      */
     public function find($expression, $type = Query::TYPE_CSS)
     {
@@ -166,7 +166,7 @@ public function find($expression, $type = Query::TYPE_CSS)
 
     /**
      * @param  string $expression XPath expression
-     * @return array
+     * @return \DiDom\Element[]
      */
     public function xpath($expression)
     {
diff --git a/src/DiDom/Element.php b/src/DiDom/Element.php
index 33f9d59..e269151 100644
--- a/src/DiDom/Element.php
+++ b/src/DiDom/Element.php
@@ -2,7 +2,7 @@
 
 namespace DiDom;
 
-use DomDocument;
+use DOMDocument;
 use DOMElement;
 use InvalidArgumentException;
 
@@ -68,7 +68,7 @@ public function toDocument()
      * 
      * @param  string $expression XPath expression or CSS selector
      * @param  string $type the type of the expression
-     * @return array instance of Element or null
+     * @return \DiDom\Element[] array of Elements
      */
     public function find($expression, $type = Query::TYPE_CSS)
     {
@@ -113,7 +113,7 @@ public function hasAttribute($name)
      *
      * @param  string $name
      * @param  string $value
-     * @return void
+     * @return \DiDom\Element
      */
     public function setAttribute($name, $value)
     {
@@ -228,7 +228,7 @@ public function __unset($name)
      *
      * @param  string $name
      * @param  mixed  $value
-     * @return void
+     * @return \DiDom\Element
      */
     public function __set($name, $value)
     {
@@ -265,7 +265,7 @@ public function __toString()
     /**
      * @param  string $expression
      * @param  string $type
-     * @return mixed
+     * @return \DiDom\Element[]
      */
     public function __invoke($expression, $type = Query::TYPE_CSS)
     {
diff --git a/src/DiDom/Query.php b/src/DiDom/Query.php
index 6ceb7c6..7593e3a 100644
--- a/src/DiDom/Query.php
+++ b/src/DiDom/Query.php
@@ -52,7 +52,7 @@ public static function compile($expression, $type = self::TYPE_CSS)
 
     /**
      * @param  string $selector
-     * @param  bool   $prefix
+     * @param  string $prefix
      * @return string
      */
     public static function cssToXpath($selector, $prefix = '//')