diff --git a/src/EchoIt/JsonApi/ErrorResponse.php b/src/EchoIt/JsonApi/ErrorResponse.php
index 919aa56..8736b5f 100644
--- a/src/EchoIt/JsonApi/ErrorResponse.php
+++ b/src/EchoIt/JsonApi/ErrorResponse.php
@@ -15,6 +15,7 @@ class ErrorResponse extends JsonResponse
      * @param int    $httpStatusCode HTTP status code
      * @param mixed  $errorCode      Internal error code
      * @param string $errorTitle     Error description
+     * @param array  $additionalAttrs
      */
     public function __construct($httpStatusCode, $errorCode, $errorTitle, array $additionalAttrs = array())
     {
diff --git a/src/EchoIt/JsonApi/Exception.php b/src/EchoIt/JsonApi/Exception.php
index b916eda..872e55d 100644
--- a/src/EchoIt/JsonApi/Exception.php
+++ b/src/EchoIt/JsonApi/Exception.php
@@ -16,6 +16,7 @@ class Exception extends \Exception
      * @param string  $message        The Exception message to throw
      * @param int     $code           The Exception code
      * @param int     $httpStatusCode HTTP status code which can be used for broken request
+     * @param array   $additionalAttrs
      */
     public function __construct($message = '', $code = 0, $httpStatusCode = 500, array $additionalAttrs = array())
     {
@@ -28,7 +29,7 @@ public function __construct($message = '', $code = 0, $httpStatusCode = 500, arr
     /**
      * This method returns a HTTP response representation of the Exception
      *
-     * @return JsonApi\ErrorResponse
+     * @return \EchoIt\JsonApi\ErrorResponse
      */
     public function response()
     {
diff --git a/src/EchoIt/JsonApi/Exception/Validation.php b/src/EchoIt/JsonApi/Exception/Validation.php
index 78732d5..43a23bd 100644
--- a/src/EchoIt/JsonApi/Exception/Validation.php
+++ b/src/EchoIt/JsonApi/Exception/Validation.php
@@ -17,10 +17,10 @@ class Validation extends Exception
     /**
      * Constructor.
      *
-     * @param string                        $message        The Exception message to throw
-     * @param int                           $code           The Exception code
-     * @param int                           $httpStatusCode HTTP status code which can be used for broken request
-     * @param Illuminate\Support\MessageBag $messages       Validation errors
+     * @param string                         $message        The Exception message to throw
+     * @param int                            $code           The Exception code
+     * @param int                            $httpStatusCode HTTP status code which can be used for broken request
+     * @param \Illuminate\Support\MessageBag $messages       Validation errors
      */
     public function __construct($message = '', $code = 0, $httpStatusCode = 500, ValidationMessages $messages = NULL)
     {
@@ -33,7 +33,7 @@ public function __construct($message = '', $code = 0, $httpStatusCode = 500, Val
     /**
      * This method returns a HTTP response representation of the Exception
      *
-     * @return JsonApi\MultiErrorResponse
+     * @return \EchoIt\JsonApi\MultiErrorResponse
      */
     public function response()
     {
diff --git a/src/EchoIt/JsonApi/Handler.php b/src/EchoIt/JsonApi/Handler.php
index ca3f002..fe85a6d 100644
--- a/src/EchoIt/JsonApi/Handler.php
+++ b/src/EchoIt/JsonApi/Handler.php
@@ -36,7 +36,7 @@ abstract class Handler
     /**
      * Constructor.
      *
-     * @param JsonApi\Request $request
+     * @param \EchoIt\JsonApi\Request $request
      */
     public function __construct(Request $request)
     {
@@ -57,7 +57,8 @@ public function supportsMethod($method)
     /**
      * Fulfill the API request and return a response.
      *
-     * @return JsonApi\Response
+     * @return \EchoIT\JsonApi\Response
+     * @throws Exception
      */
     public function fulfillRequest()
     {
@@ -135,6 +136,7 @@ protected function loadRelatedModels(Model $model) {
     /**
      * Returns which requested resources are available to include.
      *
+     * @param Model $model
      * @return array
      */
     protected function exposedRelationsFromRequest($model = null)
@@ -174,7 +176,7 @@ protected function unknownRelationsFromRequest()
     /**
      * Iterate through result set to fetch the requested resources to include.
      *
-     * @param  Illuminate\Database\Eloquent\Collection|JsonApi\Model $models
+     * @param  \Illuminate\Database\Eloquent\Collection|\EchoIT\JsonApi\Model $models
      * @return array
      */
     protected function getIncludedModels($models)
@@ -315,9 +317,10 @@ protected static function methodHandlerName($method)
     /**
      * Returns the models from a relationship. Will always return as array.
      *
-     * @param  Illuminate\Database\Eloquent\Model $model
+     * @param  \Illuminate\Database\Eloquent\Model $model
      * @param  string $relationKey
-     * @return array|Illuminate\Database\Eloquent\Collection
+     * @return array|\Illuminate\Database\Eloquent\Collection
+     * @throws Exception
      */
     protected static function getModelsForRelation($model, $relationKey)
     {
@@ -346,7 +349,7 @@ protected static function getModelsForRelation($model, $relationKey)
      *
      * @param  array &$array
      * @param  string $key
-     * @return Illuminate\Database\Eloquent\Collection
+     * @return \Illuminate\Database\Eloquent\Collection
      */
     protected static function getCollectionOrCreate(&$array, $key)
     {
@@ -374,8 +377,9 @@ protected static function getModelNameForRelation($relationName)
      * Function to handle sorting requests.
      *
      * @param  array $cols list of column names to sort on
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model
+     * @param  \EchoIt\JsonApi\Model $model
+     * @return \EchoIt\JsonApi\Model
+     * @throws Exception
      */
     protected function handleSortRequest($cols, $model)
     {
@@ -404,6 +408,7 @@ protected function handleSortRequest($cols, $model)
      * @param  string $content
      * @param  string $type the type the content is expected to be.
      * @return array
+     * @throws Exception
      */
     protected function parseRequestContent($content, $type)
     {
@@ -439,10 +444,10 @@ protected function parseRequestContent($content, $type)
     /**
      * Function to handle pagination requests.
      *
-     * @param  EchoIt\JsonApi\Request $request
-     * @param  EchoIt\JsonApi\Model $model
+     * @param  \EchoIt\JsonApi\Request $request
+     * @param  \EchoIt\JsonApi\Model $model
      * @param integer $total the total number of records
-     * @return Illuminate\Pagination\LengthAwarePaginator
+     * @return \Illuminate\Pagination\LengthAwarePaginator
      */
     protected function handlePaginationRequest($request, $model, $total = null)
     {
@@ -473,8 +478,8 @@ protected function handlePaginationRequest($request, $model, $total = null)
      * Function to handle filtering requests.
      *
      * @param  array $filters key=>value pairs of column and value to filter on
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model
+     * @param  \EchoIt\JsonApi\Model $model
+     * @return \EchoIt\JsonApi\Model
      */
     protected function handleFilterRequest($filters, $model)
     {
@@ -488,9 +493,10 @@ protected function handleFilterRequest($filters, $model)
      * Default handling of GET request.
      * Must be called explicitly in handleGet function.
      *
-     * @param  EchoIt\JsonApi\Request $request
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model|Illuminate\Pagination\LengthAwarePaginator
+     * @param  \EchoIt\JsonApi\Request $request
+     * @param  \EchoIt\JsonApi\Model $model
+     * @return \EchoIt\JsonApi\Model|\Illuminate\Pagination\LengthAwarePaginator
+     * @throws Exception
      */
     protected function handleGetDefault(Request $request, $model)
     {
@@ -531,12 +537,12 @@ protected function handleGetDefault(Request $request, $model)
      * Validates passed data against a model
      * Validation performed safely and only if model provides rules
      *
-     * @param  EchoIt\JsonApi\Model $model  model to validate against
-     * @param  Array                $values passed array of values
+     * @param  \EchoIt\JsonApi\Model $model  model to validate against
+     * @param  Array                 $values passed array of values
      *
-     * @throws Exception\Validation         Exception thrown when validation fails
+     * @throws Exception\Validation          Exception thrown when validation fails
      *
-     * @return Bool                         true if validation successful
+     * @return Bool                          true if validation successful
      */
     protected function validateModelData(Model $model, Array $values)
     {
@@ -558,9 +564,10 @@ protected function validateModelData(Model $model, Array $values)
      * Default handling of POST request.
      * Must be called explicitly in handlePost function.
      *
-     * @param  EchoIt\JsonApi\Request $request
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model
+     * @param  \EchoIt\JsonApi\Request $request
+     * @param  \EchoIt\JsonApi\Model $model
+     * @return \EchoIt\JsonApi\Model
+     * @throws Exception
      */
     public function handlePostDefault(Request $request, $model)
     {
@@ -584,9 +591,10 @@ public function handlePostDefault(Request $request, $model)
      * Default handling of PUT request.
      * Must be called explicitly in handlePut function.
      *
-     * @param  EchoIt\JsonApi\Request $request
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model
+     * @param  \EchoIt\JsonApi\Request $request
+     * @param  \EchoIt\JsonApi\Model   $model
+     * @return \EchoIt\JsonApi\Model
+     * @throws Exception
      */
     public function handlePutDefault(Request $request, $model)
     {
@@ -639,9 +647,10 @@ public function handlePutDefault(Request $request, $model)
      * Default handling of DELETE request.
      * Must be called explicitly in handleDelete function.
      *
-     * @param  EchoIt\JsonApi\Request $request
-     * @param  EchoIt\JsonApi\Model $model
-     * @return EchoIt\JsonApi\Model
+     * @param  \EchoIt\JsonApi\Request $request
+     * @param  \EchoIt\JsonApi\Model $model
+     * @return \EchoIt\JsonApi\Model
+     * @throws Exception
      */
     public function handleDeleteDefault(Request $request, $model)
     {
diff --git a/src/EchoIt/JsonApi/Model.php b/src/EchoIt/JsonApi/Model.php
index 54efa06..a4679ec 100644
--- a/src/EchoIt/JsonApi/Model.php
+++ b/src/EchoIt/JsonApi/Model.php
@@ -94,7 +94,8 @@ public function relationsFromMethod() {
     /**
      * mark this model as changed
      *
-     * @return  bool
+     * @param   bool $changed
+     * @return  void
      */
     public function markChanged($changed = true)
     {
@@ -127,7 +128,7 @@ public function getResourceType()
      *
      * @param  Array  $values  user passed values (request data)
      *
-     * @return bool|Illuminate\Support\MessageBag  True on pass, MessageBag of errors on fail
+     * @return bool|\Illuminate\Support\MessageBag  True on pass, MessageBag of errors on fail
      */
     public function validateArray(Array $values)
     {
diff --git a/src/EchoIt/JsonApi/MultiErrorResponse.php b/src/EchoIt/JsonApi/MultiErrorResponse.php
index 26306c6..e074825 100644
--- a/src/EchoIt/JsonApi/MultiErrorResponse.php
+++ b/src/EchoIt/JsonApi/MultiErrorResponse.php
@@ -13,10 +13,10 @@ class MultiErrorResponse extends JsonResponse
     /**
      * Constructor.
      *
-     * @param int                           $httpStatusCode   HTTP status code
-     * @param mixed                         $errorCode        Internal error code
-     * @param string                        $errorTitle       Error description
-     * @param Illuminate\Support\MessageBag $errors           Validation errors
+     * @param int                            $httpStatusCode   HTTP status code
+     * @param mixed                          $errorCode        Internal error code
+     * @param string                         $errorTitle       Error description
+     * @param \Illuminate\Support\MessageBag $errors           Validation errors
      */
     public function __construct($httpStatusCode, $errorCode, $errorTitle, ValidationMessages $errors = NULL)
     {
diff --git a/src/EchoIt/JsonApi/Response.php b/src/EchoIt/JsonApi/Response.php
index 5dd6481..e937feb 100644
--- a/src/EchoIt/JsonApi/Response.php
+++ b/src/EchoIt/JsonApi/Response.php
@@ -34,6 +34,7 @@ class Response
      * Constructor
      *
      * @param array|object $body
+     * @param int $httpStatusCode
      */
     public function __construct($body, $httpStatusCode = 200)
     {
@@ -60,7 +61,7 @@ public function __set($key, $value)
      * Returns a JsonResponse with the set parameters and body.
      *
      * @param  string $bodyKey The key on which to set the main response.
-     * @return Illuminate\Http\JsonResponse
+     * @return \Illuminate\Http\JsonResponse
      */
     public function toJsonResponse($bodyKey = 'data', $options = 0)
     {