diff --git a/src/Filter/Validator.php b/src/Filter/Validator.php
index af140e85..8e908988 100644
--- a/src/Filter/Validator.php
+++ b/src/Filter/Validator.php
@@ -32,6 +32,7 @@ class Validator implements FilterInterface
      * Filter out any log messages not matching the validator
      *
      * @param  ZendValidator|array|Traversable $validator
+     * @throws Exception\InvalidArgumentException
      * @return Validator
      */
     public function __construct($validator)
diff --git a/src/Logger.php b/src/Logger.php
index e6b54814..384bedad 100644
--- a/src/Logger.php
+++ b/src/Logger.php
@@ -147,7 +147,7 @@ public function setWriterPluginManager($plugins)
      *
      * @param string $name
      * @param array|null $options
-     * @return Writer
+     * @return Writer\WriterInterface
      */
     public function writerPlugin($name, array $options = null)
     {
@@ -157,8 +157,9 @@ public function writerPlugin($name, array $options = null)
     /**
      * Add a writer to a logger
      *
-     * @param  string|Writer $writer
+     * @param  string|Writer\WriterInterface $writer
      * @param  int $priority
+     * @param  array|null $options
      * @return Logger
      * @throws Exception\InvalidArgumentException
      */
@@ -214,6 +215,7 @@ public function setWriters(SplPriorityQueue $writers)
      * @return Logger
      * @throws Exception\InvalidArgumentException if message can't be cast to string
      * @throws Exception\InvalidArgumentException if extra can't be iterated over
+     * @throws Exception\RuntimeException if no log writer specified
      */
     public function log($priority, $message, $extra = array())
     {
diff --git a/src/LoggerInterface.php b/src/LoggerInterface.php
index 267b5664..d32ceabf 100644
--- a/src/LoggerInterface.php
+++ b/src/LoggerInterface.php
@@ -10,6 +10,8 @@
 
 namespace Zend\Log;
 
+use Traversable;
+
 /**
  * @category   Zend
  * @package    Zend_Log
@@ -18,57 +20,57 @@ interface LoggerInterface
 {
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function emerg($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function alert($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function crit($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function err($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function warn($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function notice($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function info($message, $extra = array());
 
     /**
      * @param string $message
-     * @param array|\Traversable $extra
-     * @return Loggabble
+     * @param array|Traversable $extra
+     * @return LoggerInterface
      */
     public function debug($message, $extra = array());
 }
diff --git a/src/Writer/AbstractWriter.php b/src/Writer/AbstractWriter.php
index dd59f398..8a41cc5c 100644
--- a/src/Writer/AbstractWriter.php
+++ b/src/Writer/AbstractWriter.php
@@ -31,7 +31,7 @@ abstract class AbstractWriter implements WriterInterface
     /**
      * Filter chain
      *
-     * @var array
+     * @var Filter\FilterInterface[]
      */
     protected $filters = array();
 
@@ -46,6 +46,7 @@ abstract class AbstractWriter implements WriterInterface
      * Add a filter specific to this writer.
      *
      * @param  int|string|Filter\FilterInterface $filter
+     * @param  array|null $options
      * @return AbstractWriter
      * @throws Exception\InvalidArgumentException
      */
@@ -87,7 +88,7 @@ public function getFilterPluginManager()
      * Set filter plugin manager
      *
      * @param  string|FilterPluginManager $plugins
-     * @return Logger
+     * @return self
      * @throws Exception\InvalidArgumentException
      */
     public function setFilterPluginManager($plugins)
@@ -112,7 +113,7 @@ public function setFilterPluginManager($plugins)
      *
      * @param string $name
      * @param array|null $options
-     * @return Writer
+     * @return Filter\FilterInterface
      */
     public function filterPlugin($name, array $options = null)
     {
diff --git a/src/Writer/Db.php b/src/Writer/Db.php
index 0d35606e..bc0c3987 100644
--- a/src/Writer/Db.php
+++ b/src/Writer/Db.php
@@ -60,8 +60,7 @@ class Db extends AbstractWriter
      * @param string $tableName
      * @param array $columnMap
      * @param string $separator
-     * @return Db
-     * @throw Exception\InvalidArgumentException
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($db, $tableName = null, array $columnMap = null, $separator = null)
     {
diff --git a/src/Writer/FilterPluginManager.php b/src/Writer/FilterPluginManager.php
index 83cd8135..55b927aa 100644
--- a/src/Writer/FilterPluginManager.php
+++ b/src/Writer/FilterPluginManager.php
@@ -11,7 +11,6 @@
 namespace Zend\Log\Writer;
 
 use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\ConfigurationInterface;
 use Zend\Log\Filter;
 use Zend\Log\Exception;
 
diff --git a/src/Writer/Mail.php b/src/Writer/Mail.php
index d34a7410..becc6184 100644
--- a/src/Writer/Mail.php
+++ b/src/Writer/Mail.php
@@ -76,7 +76,7 @@ class Mail extends AbstractWriter
      *
      * @param  MailMessage|array|Traversable $mail
      * @param  Transport\TransportInterface $transport Optional
-     * @return Mail
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($mail, Transport\TransportInterface $transport = null)
     {
diff --git a/src/Writer/MongoDB.php b/src/Writer/MongoDB.php
index f9cae3dc..c6fbe40d 100644
--- a/src/Writer/MongoDB.php
+++ b/src/Writer/MongoDB.php
@@ -50,6 +50,7 @@ class MongoDB extends AbstractWriter
      * @param string|MongoDB $database
      * @param string $collection
      * @param array $saveOptions
+     * @throws Exception\InvalidArgumentException
      */
     public function __construct($mongo, $database, $collection, array $saveOptions = array())
     {
diff --git a/src/WriterPluginManager.php b/src/WriterPluginManager.php
index 53558237..68ee6281 100644
--- a/src/WriterPluginManager.php
+++ b/src/WriterPluginManager.php
@@ -11,7 +11,6 @@
 namespace Zend\Log;
 
 use Zend\ServiceManager\AbstractPluginManager;
-use Zend\ServiceManager\ConfigurationInterface;
 
 /**
  * @category   Zend