diff --git a/app/Http/Controllers/Chart/AccountController.php b/app/Http/Controllers/Chart/AccountController.php
index 92cd33233a..dc6fe0cf13 100644
--- a/app/Http/Controllers/Chart/AccountController.php
+++ b/app/Http/Controllers/Chart/AccountController.php
@@ -53,6 +53,7 @@ class AccountController extends Controller
         $cache->addProperty('all');
         $cache->addProperty('accounts');
         $cache->addProperty('default');
+        $cache->addProperty($reportType);
         $cache->addProperty($accounts);
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
diff --git a/app/Http/Controllers/Chart/ReportController.php b/app/Http/Controllers/Chart/ReportController.php
index ebd258c680..1c2a68651a 100644
--- a/app/Http/Controllers/Chart/ReportController.php
+++ b/app/Http/Controllers/Chart/ReportController.php
@@ -49,6 +49,7 @@ class ReportController extends Controller
         $cache = new CacheProperties;
         $cache->addProperty('yearInOut');
         $cache->addProperty($start);
+        $cache->addProperty($reportType);
         $cache->addProperty($accounts);
         $cache->addProperty($end);
         if ($cache->has()) {
@@ -115,6 +116,7 @@ class ReportController extends Controller
         $cache->addProperty('yearInOutSummarized');
         $cache->addProperty($start);
         $cache->addProperty($end);
+        $cache->addProperty($reportType);
         $cache->addProperty($accounts);
         if ($cache->has()) {
             return Response::json($cache->get()); // @codeCoverageIgnore
diff --git a/app/Http/Controllers/CsvController.php b/app/Http/Controllers/CsvController.php
index f2cac49ff6..bde7d5b7e0 100644
--- a/app/Http/Controllers/CsvController.php
+++ b/app/Http/Controllers/CsvController.php
@@ -146,7 +146,7 @@ class CsvController extends Controller
      *
      * STEP ONE
      *
-     * @param AccountRepositoryInterface $repository
+     * @param ARI $repository
      *
      * @return \Illuminate\View\View
      */
diff --git a/app/Http/Controllers/PiggyBankController.php b/app/Http/Controllers/PiggyBankController.php
index 8b431fdd72..6c33fccc8c 100644
--- a/app/Http/Controllers/PiggyBankController.php
+++ b/app/Http/Controllers/PiggyBankController.php
@@ -157,7 +157,7 @@ class PiggyBankController extends Controller
     }
 
     /**
-     * @param AccountRepositoryInterface   $repository
+     * @param ARI   $repository
      * @param PiggyBankRepositoryInterface $piggyRepository
      *
      * @return View
diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index a11d1d9e99..5cc1d665de 100644
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -54,8 +54,9 @@ class Authenticate
                 return redirect()->guest('auth/login');
             }
         }
-
-        if ($this->auth->user() instanceof User && intval($this->auth->user()->blocked) == 1) {
+        /** @var User $user */
+        $user = $this->auth->user();
+        if ($user instanceof User && intval($user->blocked) == 1) {
             Auth::logout();
 
             return redirect()->route('index');
diff --git a/app/Http/breadcrumbs.php b/app/Http/breadcrumbs.php
index e429509482..f4c6487c1d 100644
--- a/app/Http/breadcrumbs.php
+++ b/app/Http/breadcrumbs.php
@@ -355,9 +355,9 @@ Breadcrumbs::register(
     $breadcrumbs->parent('reports.index');
 
     $monthFormat = trans('config.month_and_day');
-    $title       = trans('firefly.report_default', ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
+    $title       = trans('firefly.report_' . $reportType, ['start' => $start->formatLocalized($monthFormat), 'end' => $end->formatLocalized($monthFormat)]);
 
-    $breadcrumbs->push($title, route('reports.report', ['url' => 'abcde']));
+    $breadcrumbs->push($title, route('reports.report', [$reportType, $start->format('Ymd'), $end->format('Ymd'), join(',', $accountIds)]));
 }
 );
 
diff --git a/app/Models/Account.php b/app/Models/Account.php
index b3967b1da4..683310dbfc 100644
--- a/app/Models/Account.php
+++ b/app/Models/Account.php
@@ -1,53 +1,38 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Illuminate\Database\Query\JoinClause;
 use Watson\Validating\ValidatingTrait;
 
 /**
- * Class Account
+ * FireflyIII\Models\Account
  *
- * @package FireflyIII\Models
- * @property integer                                                                        $id
- * @property \Carbon\Carbon                                                                 $created_at
- * @property \Carbon\Carbon                                                                 $updated_at
- * @property \Carbon\Carbon                                                                 $deleted_at
- * @property integer                                                                        $user_id
- * @property integer                                                                        $account_type_id
- * @property string                                                                         $name
- * @property boolean                                                                        $active
- * @property boolean                                                                        $encrypted
- * @property float                                                                          $virtual_balance
- * @property string                                                                         $iban
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\AccountMeta[] $accountMeta
- * @property-read \FireflyIII\Models\AccountType                                            $accountType
- * @property-read mixed                                                                     $name_for_editform
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBank[]   $piggyBanks
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[] $transactions
- * @property-read \FireflyIII\User                                                          $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereAccountTypeId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereActive($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereEncrypted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereVirtualBalance($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account whereIban($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account accountTypeIn($types)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Account hasMetaValue($name, $value)
- * @property-read bool                                                                      $joinedAccountTypes
- * @property float                                                                          $startBalance
- * @property float                                                                          $endBalance
- * @property float                                                                          $piggyBalance
- * @property float                                                                          $percentage
- * @property float                                                                          $difference
- * @property \Carbon\Carbon                                                                 $lastActivityDate
+ * @property integer                       $id
+ * @property Carbon                        $created_at
+ * @property Carbon                        $updated_at
+ * @property Carbon                        $deleted_at
+ * @property integer                       $user_id
+ * @property integer                       $account_type_id
+ * @property string                        $name
+ * @property boolean                       $active
+ * @property boolean                       $encrypted
+ * @property float                         $virtual_balance
+ * @property string                        $iban
+ * @property-read Collection|AccountMeta[] $accountMeta
+ * @property-read AccountType              $accountType
+ * @property-read mixed                    $name_for_editform
+ * @property-read Collection|PiggyBank[]   $piggyBanks
+ * @property-read Collection|Transaction[] $transactions
+ * @property-read User                     $user
+ * @method static Builder|Account accountTypeIn($types)
+ * @method static Builder|Account hasMetaValue($name, $value)
  */
 class Account extends Model
 {
diff --git a/app/Models/AccountMeta.php b/app/Models/AccountMeta.php
index 42c0f4837b..aab45415f6 100644
--- a/app/Models/AccountMeta.php
+++ b/app/Models/AccountMeta.php
@@ -1,25 +1,19 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
 
 /**
- * Class AccountMeta
+ * FireflyIII\Models\AccountMeta
  *
- * @package FireflyIII\Models
- * @property integer                         $id
- * @property \Carbon\Carbon                  $created_at
- * @property \Carbon\Carbon                  $updated_at
- * @property integer                         $account_id
- * @property string                          $name
- * @property string                          $data
- * @property-read \FireflyIII\Models\Account $account
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereAccountId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountMeta whereData($value)
+ * @property integer      $id
+ * @property Carbon       $created_at
+ * @property Carbon       $updated_at
+ * @property integer      $account_id
+ * @property string       $name
+ * @property string       $data
+ * @property-read Account $account
  */
 class AccountMeta extends Model
 {
diff --git a/app/Models/AccountType.php b/app/Models/AccountType.php
index 65b1e0474c..55f1e1f720 100644
--- a/app/Models/AccountType.php
+++ b/app/Models/AccountType.php
@@ -1,22 +1,18 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class AccountType
+ * FireflyIII\Models\AccountType
  *
- * @package FireflyIII\Models
- * @property integer                                                                    $id
- * @property \Carbon\Carbon                                                             $created_at
- * @property \Carbon\Carbon                                                             $updated_at
- * @property string                                                                     $type
- * @property boolean                                                                    $editable
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[] $accounts
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereType($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\AccountType whereEditable($value)
+ * @property integer                   $id
+ * @property Carbon                    $created_at
+ * @property Carbon                    $updated_at
+ * @property string                    $type
+ * @property boolean                   $editable
+ * @property-read Collection|Account[] $accounts
  */
 class AccountType extends Model
 {
diff --git a/app/Models/Attachment.php b/app/Models/Attachment.php
index 63bd69586c..c73424d76a 100644
--- a/app/Models/Attachment.php
+++ b/app/Models/Attachment.php
@@ -2,46 +2,32 @@
 
 namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class Attachment
+ * FireflyIII\Models\Attachment
  *
- * @package FireflyIII\Models
- * @property integer               $id
- * @property \Carbon\Carbon        $created_at
- * @property \Carbon\Carbon        $updated_at
- * @property string                $deleted_at
- * @property integer               $attachable_id
- * @property string                $attachable_type
- * @property integer               $user_id
- * @property string                $md5
- * @property string                $filename
- * @property string                $mime
- * @property integer               $size
- * @property boolean               $uploaded
- * @property-read \                $attachable
- * @property-read \FireflyIII\User $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereAttachableType($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMd5($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereFilename($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereMime($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereSize($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereUploaded($value)
- * @property string                $title
- * @property string                $description
- * @property string                $notes
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereTitle($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Attachment whereNotes($value)
+ * @property integer         $id
+ * @property Carbon          $created_at
+ * @property Carbon          $updated_at
+ * @property string          $deleted_at
+ * @property integer         $attachable_id
+ * @property string          $attachable_type
+ * @property integer         $user_id
+ * @property string          $md5
+ * @property string          $filename
+ * @property string          $title
+ * @property string          $description
+ * @property string          $notes
+ * @property string          $mime
+ * @property integer         $size
+ * @property boolean         $uploaded
+ * @property-read Attachment $attachable
+ * @property-read User       $user
  */
 class Attachment extends Model
 {
diff --git a/app/Models/Bill.php b/app/Models/Bill.php
index 7f93843fa6..c148f88a10 100644
--- a/app/Models/Bill.php
+++ b/app/Models/Bill.php
@@ -1,47 +1,31 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Bill
+ * FireflyIII\Models\Bill
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property integer                                                                               $user_id
- * @property string                                                                                $name
- * @property string                                                                                $match
- * @property float                                                                                 $amount_min
- * @property float                                                                                 $amount_max
- * @property \Carbon\Carbon                                                                        $date
- * @property boolean                                                                               $active
- * @property boolean                                                                               $automatch
- * @property string                                                                                $repeat_freq
- * @property integer                                                                               $skip
- * @property boolean                                                                               $name_encrypted
- * @property boolean                                                                               $match_encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \FireflyIII\User                                                                 $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatch($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMin($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAmountMax($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereDate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereActive($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereAutomatch($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereRepeatFreq($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereSkip($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereNameEncrypted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Bill whereMatchEncrypted($value)
- * @property \Carbon\Carbon                                                                        $nextExpectedMatch
- * @property \Carbon\Carbon                                                                        $lastFoundMatch
- * @property-read string                                                                           $expectedAmount
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property integer                              $user_id
+ * @property string                               $name
+ * @property string                               $match
+ * @property float                                $amount_min
+ * @property float                                $amount_max
+ * @property Carbon                               $date
+ * @property boolean                              $active
+ * @property boolean                              $automatch
+ * @property string                               $repeat_freq
+ * @property integer                              $skip
+ * @property boolean                              $name_encrypted
+ * @property boolean                              $match_encrypted
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read User                            $user
  */
 class Bill extends Model
 {
diff --git a/app/Models/Budget.php b/app/Models/Budget.php
index 07e7b146ee..26f085a118 100644
--- a/app/Models/Budget.php
+++ b/app/Models/Budget.php
@@ -1,32 +1,26 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class Budget
+ * FireflyIII\Models\Budget
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property \Carbon\Carbon                                                                        $deleted_at
- * @property string                                                                                $name
- * @property integer                                                                               $user_id
- * @property boolean                                                                               $active
- * @property boolean                                                                               $encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\BudgetLimit[]        $budgetlimits
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \FireflyIII\User                                                                 $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereActive($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Budget whereEncrypted($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property Carbon                               $deleted_at
+ * @property string                               $name
+ * @property integer                              $user_id
+ * @property boolean                              $active
+ * @property boolean                              $encrypted
+ * @property-read Collection|BudgetLimit[]        $budgetlimits
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read User                            $user
  */
 class Budget extends Model
 {
diff --git a/app/Models/BudgetLimit.php b/app/Models/BudgetLimit.php
index 2a4a61b64d..ba44ed72b0 100644
--- a/app/Models/BudgetLimit.php
+++ b/app/Models/BudgetLimit.php
@@ -1,29 +1,22 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class BudgetLimit
+ * FireflyIII\Models\BudgetLimit
  *
- * @package FireflyIII\Models
- * @property integer                                                                            $id
- * @property \Carbon\Carbon                                                                     $created_at
- * @property \Carbon\Carbon                                                                     $updated_at
- * @property integer                                                                            $budget_id
- * @property \Carbon\Carbon                                                                     $startdate
- * @property float                                                                              $amount
- * @property boolean                                                                            $repeats
- * @property string                                                                             $repeat_freq
- * @property-read \FireflyIII\Models\Budget                                                     $budget
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\LimitRepetition[] $limitrepetitions
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereBudgetId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereAmount($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeats($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\BudgetLimit whereRepeatFreq($value)
+ * @property integer                           $id
+ * @property Carbon                            $created_at
+ * @property Carbon                            $updated_at
+ * @property integer                           $budget_id
+ * @property Carbon                            $startdate
+ * @property float                             $amount
+ * @property boolean                           $repeats
+ * @property string                            $repeat_freq
+ * @property-read Budget                       $budget
+ * @property-read Collection|LimitRepetition[] $limitrepetitions
  */
 class BudgetLimit extends Model
 {
diff --git a/app/Models/Category.php b/app/Models/Category.php
index af8593d06b..fca9c789a9 100644
--- a/app/Models/Category.php
+++ b/app/Models/Category.php
@@ -1,31 +1,24 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class Category
+ * FireflyIII\Models\Category
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property \Carbon\Carbon                                                                        $deleted_at
- * @property string                                                                                $name
- * @property integer                                                                               $user_id
- * @property boolean                                                                               $encrypted
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \FireflyIII\User                                                                 $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Category whereEncrypted($value)
- * @property-read float                                                                            $spent
- * @property \Carbon\Carbon                                                                        $lastActivity
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property Carbon                               $deleted_at
+ * @property string                               $name
+ * @property integer                              $user_id
+ * @property boolean                              $encrypted
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read User                            $user
  */
 class Category extends Model
 {
diff --git a/app/Models/Component.php b/app/Models/Component.php
index cd21c366b7..82ffc02f1c 100644
--- a/app/Models/Component.php
+++ b/app/Models/Component.php
@@ -1,26 +1,19 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class Component
+ * FireflyIII\Models\Component
  *
- * @package FireflyIII\Models
- * @property integer        $id
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property \Carbon\Carbon $deleted_at
- * @property string         $name
- * @property integer        $user_id
- * @property string         $class
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Component whereClass($value)
+ * @property integer $id
+ * @property Carbon  $created_at
+ * @property Carbon  $updated_at
+ * @property Carbon  $deleted_at
+ * @property string  $name
+ * @property integer $user_id
+ * @property string  $class
  */
 class Component extends Model
 {
diff --git a/app/Models/LimitRepetition.php b/app/Models/LimitRepetition.php
index 29c48ed359..4009e6479b 100644
--- a/app/Models/LimitRepetition.php
+++ b/app/Models/LimitRepetition.php
@@ -1,26 +1,19 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class LimitRepetition
+ * FireflyIII\Models\LimitRepetition
  *
- * @package FireflyIII\Models
- * @property integer                             $id
- * @property \Carbon\Carbon                      $created_at
- * @property \Carbon\Carbon                      $updated_at
- * @property integer                             $budget_limit_id
- * @property \Carbon\Carbon                      $startdate
- * @property \Carbon\Carbon                      $enddate
- * @property float                               $amount
- * @property-read \FireflyIII\Models\BudgetLimit $budgetLimit
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereBudgetLimitId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereEnddate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\LimitRepetition whereAmount($value)
+ * @property integer          $id
+ * @property Carbon           $created_at
+ * @property Carbon           $updated_at
+ * @property integer          $budget_limit_id
+ * @property Carbon           $startdate
+ * @property Carbon           $enddate
+ * @property float            $amount
+ * @property-read BudgetLimit $budgetLimit
  */
 class LimitRepetition extends Model
 {
diff --git a/app/Models/Permission.php b/app/Models/Permission.php
index 1b6aaeb147..26fe705877 100644
--- a/app/Models/Permission.php
+++ b/app/Models/Permission.php
@@ -2,25 +2,20 @@
 
 namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Zizaco\Entrust\EntrustPermission;
 
 /**
- * Class Permission
+ * FireflyIII\Models\Permission
  *
- * @package FireflyIII\Models
- * @property integer        $id
- * @property string         $name
- * @property string         $display_name
- * @property string         $description
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDisplayName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Permission whereUpdatedAt($value)
+ * @property integer                $id
+ * @property string                 $name
+ * @property string                 $display_name
+ * @property string                 $description
+ * @property Carbon                 $created_at
+ * @property Carbon                 $updated_at
+ * @property-read Collection|Role[] $roles
  */
 class Permission extends EntrustPermission
 {
diff --git a/app/Models/PiggyBank.php b/app/Models/PiggyBank.php
index 33f6be11c4..d4e9e7c44b 100644
--- a/app/Models/PiggyBank.php
+++ b/app/Models/PiggyBank.php
@@ -1,45 +1,30 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class PiggyBank
+ * FireflyIII\Models\PiggyBank
  *
- * @package FireflyIII\Models
- * @property integer                                                                                $id
- * @property \Carbon\Carbon                                                                         $created_at
- * @property \Carbon\Carbon                                                                         $updated_at
- * @property \Carbon\Carbon                                                                         $deleted_at
- * @property integer                                                                                $account_id
- * @property string                                                                                 $name
- * @property float                                                                                  $targetamount
- * @property \Carbon\Carbon                                                                         $startdate
- * @property \Carbon\Carbon                                                                         $targetdate
- * @property integer                                                                                $order
- * @property boolean                                                                                $encrypted
- * @property boolean                                                                                $remind_me
- * @property integer                                                                                $reminder_skip
- * @property-read \FireflyIII\Models\Account                                                        $account
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankRepetition[] $piggyBankRepetitions
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[]      $piggyBankEvents
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereAccountId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetamount($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereTargetdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereOrder($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereEncrypted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereRemindMe($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminderSkip($value)
- * @property-read \FireflyIII\Models\PiggyBankRepetition                                            $currentRep
- * @property string                                                                                 $reminder
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBank whereReminder($value)
+ * @property integer                               $id
+ * @property Carbon                                $created_at
+ * @property Carbon                                $updated_at
+ * @property Carbon                                $deleted_at
+ * @property integer                               $account_id
+ * @property string                                $name
+ * @property float                                 $targetamount
+ * @property Carbon                                $startdate
+ * @property Carbon                                $targetdate
+ * @property integer                               $order
+ * @property boolean                               $encrypted
+ * @property boolean                               $remind_me
+ * @property integer                               $reminder_skip
+ * @property-read Account                          $account
+ * @property-read Collection|PiggyBankRepetition[] $piggyBankRepetitions
+ * @property-read Collection|PiggyBankEvent[]      $piggyBankEvents
  */
 class PiggyBank extends Model
 {
diff --git a/app/Models/PiggyBankEvent.php b/app/Models/PiggyBankEvent.php
index 60609f37ae..a67d81d9d2 100644
--- a/app/Models/PiggyBankEvent.php
+++ b/app/Models/PiggyBankEvent.php
@@ -1,27 +1,20 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class PiggyBankEvent
+ * FireflyIII\Models\PiggyBankEvent
  *
- * @package FireflyIII\Models
- * @property integer                                    $id
- * @property \Carbon\Carbon                             $created_at
- * @property \Carbon\Carbon                             $updated_at
- * @property integer                                    $piggy_bank_id
- * @property integer                                    $transaction_journal_id
- * @property \Carbon\Carbon                             $date
- * @property float                                      $amount
- * @property \FireflyIII\Models\PiggyBank               $piggyBank
- * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent wherePiggyBankId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereTransactionJournalId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereDate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankEvent whereAmount($value)
+ * @property integer                 $id
+ * @property Carbon                  $created_at
+ * @property Carbon                  $updated_at
+ * @property integer                 $piggy_bank_id
+ * @property integer                 $transaction_journal_id
+ * @property Carbon                  $date
+ * @property float                   $amount
+ * @property-read PiggyBank          $piggyBank
+ * @property-read TransactionJournal $transactionJournal
  */
 class PiggyBankEvent extends Model
 {
diff --git a/app/Models/PiggyBankRepetition.php b/app/Models/PiggyBankRepetition.php
index 2c410351e4..25ada5c27b 100644
--- a/app/Models/PiggyBankRepetition.php
+++ b/app/Models/PiggyBankRepetition.php
@@ -3,28 +3,21 @@
 use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder;
 
 /**
- * Class PiggyBankRepetition
+ * FireflyIII\Models\PiggyBankRepetition
  *
- * @package FireflyIII\Models
- * @property integer                           $id
- * @property \Carbon\Carbon                    $created_at
- * @property \Carbon\Carbon                    $updated_at
- * @property integer                           $piggy_bank_id
- * @property \Carbon\Carbon                    $startdate
- * @property \Carbon\Carbon                    $targetdate
- * @property float                             $currentamount
- * @property-read \FireflyIII\Models\PiggyBank $piggyBank
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition wherePiggyBankId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereStartdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereTargetdate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition whereCurrentamount($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition onDates($start, $target)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\PiggyBankRepetition relevantOnDate($date)
+ * @property integer        $id
+ * @property Carbon         $created_at
+ * @property Carbon         $updated_at
+ * @property integer        $piggy_bank_id
+ * @property Carbon         $startdate
+ * @property Carbon         $targetdate
+ * @property float          $currentamount
+ * @property-read PiggyBank $piggyBank
+ * @method static Builder|PiggyBankRepetition onDates($start, $target)
+ * @method static Builder|PiggyBankRepetition relevantOnDate($date)
  */
 class PiggyBankRepetition extends Model
 {
diff --git a/app/Models/Preference.php b/app/Models/Preference.php
index 258216dd6f..d66b36476e 100644
--- a/app/Models/Preference.php
+++ b/app/Models/Preference.php
@@ -1,29 +1,22 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
 use Illuminate\Database\Eloquent\Model;
 
 /**
- * Class Preference
+ * FireflyIII\Models\Preference
  *
- * @package FireflyIII\Models
- * @property integer               $id
- * @property \Carbon\Carbon        $created_at
- * @property \Carbon\Carbon        $updated_at
- * @property integer               $user_id
- * @property string                $name
- * @property string                $name_encrypted
- * @property string                $data
- * @property string                $data_encrypted
- * @property-read \FireflyIII\User $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereNameEncrypted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereData($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Preference whereDataEncrypted($value)
+ * @property integer   $id
+ * @property Carbon    $created_at
+ * @property Carbon    $updated_at
+ * @property integer   $user_id
+ * @property string    $name
+ * @property string    $name_encrypted
+ * @property string    $data
+ * @property string    $data_encrypted
+ * @property-read User $user
  */
 class Preference extends Model
 {
diff --git a/app/Models/Role.php b/app/Models/Role.php
index 6cee8151d3..47af6ddcf2 100644
--- a/app/Models/Role.php
+++ b/app/Models/Role.php
@@ -2,26 +2,21 @@
 namespace FireflyIII\Models;
 
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Zizaco\Entrust\EntrustRole;
 
 /**
- * Class Role
+ * FireflyIII\Models\Role
  *
- * @package FireflyIII\Models
- * @property integer        $id
- * @property string         $name
- * @property string         $display_name
- * @property string         $description
- * @property \Carbon\Carbon $created_at
- * @property \Carbon\Carbon $updated_at
- * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('auth.model[] $users
- * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.permission[] $perms
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDisplayName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Role whereUpdatedAt($value)
+ * @property integer                            $id
+ * @property string                             $name
+ * @property string                             $display_name
+ * @property string                             $description
+ * @property Carbon                             $created_at
+ * @property Carbon                             $updated_at
+ * @property-read Collection|\FireflyIII\User[] $users
+ * @property-read Collection|Permission[]       $perms
  */
 class Role extends EntrustRole
 {
diff --git a/app/Models/Tag.php b/app/Models/Tag.php
index f7784212bd..e1ffe69155 100644
--- a/app/Models/Tag.php
+++ b/app/Models/Tag.php
@@ -2,40 +2,30 @@
 
 namespace FireflyIII\Models;
 
+use Carbon\Carbon;
 use Crypt;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Watson\Validating\ValidatingTrait;
 
 /**
- * Class Tag
+ * FireflyIII\Models\Tag
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property string                                                                                $deleted_at
- * @property integer                                                                               $user_id
- * @property string                                                                                $tag
- * @property string                                                                                $tagMode
- * @property \Carbon\Carbon                                                                        $date
- * @property string                                                                                $description
- * @property float                                                                                 $latitude
- * @property float                                                                                 $longitude
- * @property integer                                                                               $zoomLevel
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \FireflyIII\User                                                                 $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTag($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereTagMode($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLatitude($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereLongitude($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Tag whereZoomLevel($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property string                               $deleted_at
+ * @property integer                              $user_id
+ * @property string                               $tag
+ * @property string                               $tagMode
+ * @property Carbon                               $date
+ * @property string                               $description
+ * @property float                                $latitude
+ * @property float                                $longitude
+ * @property integer                              $zoomLevel
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read User                            $user
  */
 class Tag extends Model
 {
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index e2b799220b..1bdd1148a1 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -4,34 +4,24 @@ use Carbon\Carbon;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Watson\Validating\ValidatingTrait;
 
 /**
- * Class Transaction
+ * FireflyIII\Models\Transaction
  *
- * @package FireflyIII\Models
- * @property integer                                    $id
- * @property \Carbon\Carbon                             $created_at
- * @property \Carbon\Carbon                             $updated_at
- * @property \Carbon\Carbon                             $deleted_at
- * @property integer                                    $account_id
- * @property integer                                    $transaction_journal_id
- * @property string                                     $description
- * @property float                                      $amount
- * @property-read \FireflyIII\Models\Account            $account
- * @property-read \FireflyIII\Models\TransactionJournal $transactionJournal
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAccountId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereTransactionJournalId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction whereAmount($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction after($date)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\Transaction before($date)
- * @property float                                      $before
- * @property float                                      $after
+ * @property integer                 $id
+ * @property Carbon                  $created_at
+ * @property Carbon                  $updated_at
+ * @property Carbon                  $deleted_at
+ * @property integer                 $account_id
+ * @property integer                 $transaction_journal_id
+ * @property string                  $description
+ * @property float                   $amount
+ * @property-read Account            $account
+ * @property-read TransactionJournal $transactionJournal
+ * @method static Builder|Transaction after($date)
+ * @method static Builder|Transaction before($date)
  */
 class Transaction extends Model
 {
diff --git a/app/Models/TransactionCurrency.php b/app/Models/TransactionCurrency.php
index 8323329c99..bd9b6db6ad 100644
--- a/app/Models/TransactionCurrency.php
+++ b/app/Models/TransactionCurrency.php
@@ -1,27 +1,21 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class TransactionCurrency
+ * FireflyIII\Models\TransactionCurrency
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property \Carbon\Carbon                                                                        $deleted_at
- * @property string                                                                                $code
- * @property string                                                                                $name
- * @property string                                                                                $symbol
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereCode($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereName($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionCurrency whereSymbol($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property Carbon                               $deleted_at
+ * @property string                               $code
+ * @property string                               $name
+ * @property string                               $symbol
+ * @property-read Collection|TransactionJournal[] $transactionJournals
  */
 class TransactionCurrency extends Model
 {
diff --git a/app/Models/TransactionGroup.php b/app/Models/TransactionGroup.php
index 606bb59f15..5d2830778d 100644
--- a/app/Models/TransactionGroup.php
+++ b/app/Models/TransactionGroup.php
@@ -1,26 +1,22 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use FireflyIII\User;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class TransactionGroup
+ * FireflyIII\Models\TransactionGroup
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property \Carbon\Carbon                                                                        $deleted_at
- * @property integer                                                                               $user_id
- * @property string                                                                                $relation
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \FireflyIII\User                                                                 $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionGroup whereRelation($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property Carbon                               $deleted_at
+ * @property integer                              $user_id
+ * @property string                               $relation
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read User                            $user
  */
 class TransactionGroup extends Model
 {
diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php
index 0aff8fd74f..ab4ed569ec 100644
--- a/app/Models/TransactionJournal.php
+++ b/app/Models/TransactionJournal.php
@@ -3,74 +3,53 @@
 use Carbon\Carbon;
 use Crypt;
 use FireflyIII\Support\CacheProperties;
+use FireflyIII\User;
 use Illuminate\Database\Eloquent\Builder as EloquentBuilder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Query\Builder;
 use Watson\Validating\ValidatingTrait;
 
 /**
- * Class TransactionJournal
+ * FireflyIII\Models\TransactionJournal
  *
- * @package FireflyIII\Models
- * @property integer                                                                             $id
- * @property \Carbon\Carbon                                                                      $created_at
- * @property \Carbon\Carbon                                                                      $updated_at
- * @property \Carbon\Carbon                                                                      $deleted_at
- * @property integer                                                                             $user_id
- * @property integer                                                                             $transaction_type_id
- * @property integer                                                                             $bill_id
- * @property integer                                                                             $transaction_currency_id
- * @property string                                                                              $description
- * @property boolean                                                                             $completed
- * @property \Carbon\Carbon                                                                      $date
- * @property boolean                                                                             $encrypted
- * @property integer                                                                             $order
- * @property integer                                                                             $tag_count
- * @property-read \FireflyIII\Models\Bill                                                        $bill
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[]           $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[]         $categories
- * @property-read mixed                                                                          $actual_amount
- * @property-read mixed                                                                          $amount
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[]              $tags
- * @property-read mixed                                                                          $correct_amount
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Transaction[]      $transactions
- * @property-read mixed                                                                          $destination_account
- * @property-read mixed                                                                          $source_account
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\PiggyBankEvent[]   $piggyBankEvents
- * @property-read \FireflyIII\Models\TransactionCurrency                                         $transactionCurrency
- * @property-read \FireflyIII\Models\TransactionType                                             $transactionType
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionGroup[] $transactiongroups
- * @property-read \FireflyIII\User                                                               $user
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereUserId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionTypeId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereBillId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTransactionCurrencyId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDescription($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereCompleted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereDate($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereEncrypted($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereOrder($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal whereTagCount($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal accountIs($account)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal after($date)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal before($date)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal onDate($date)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal transactionTypes($types)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionJournal withRelevantData()
- * @property-read bool                                                                           $account_encrypted
- * @property-read bool                                                                           $joinedTransactions
- * @property-read bool                                                                           $joinedTransactionTypes
- * @property-read int                                                                            $account_id
- * @property string                                                                              $name
- * @property-read string                                                                         $symbol
- * @property-read string                                                                         $type
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[]       $attachments
- * @property-read mixed                                                                          $amount_positive
+ * @property integer                            $id
+ * @property Carbon                             $created_at
+ * @property Carbon                             $updated_at
+ * @property Carbon                             $deleted_at
+ * @property integer                            $user_id
+ * @property integer                            $transaction_type_id
+ * @property integer                            $bill_id
+ * @property integer                            $transaction_currency_id
+ * @property string                             $description
+ * @property boolean                            $completed
+ * @property Carbon                             $date
+ * @property boolean                            $encrypted
+ * @property integer                            $order
+ * @property integer                            $tag_count
+ * @property-read Bill                          $bill
+ * @property-read Collection|Budget[]           $budgets
+ * @property-read Collection|Category[]         $categories
+ * @property-read mixed                         $amount_positive
+ * @property-read mixed                         $amount
+ * @property-read Collection|Tag[]              $tags
+ * @property-read Collection|Transaction[]      $transactions
+ * @property-read mixed                         $destination_account
+ * @property-read mixed                         $source_account
+ * @property-read Collection|PiggyBankEvent[]   $piggyBankEvents
+ * @property-read Collection|Attachment[]       $attachments
+ * @property-read TransactionCurrency           $transactionCurrency
+ * @property-read TransactionType               $transactionType
+ * @property-read Collection|TransactionGroup[] $transactiongroups
+ * @property-read User                          $user
+ * @method static Builder|TransactionJournal accountIs($account)
+ * @method static Builder|TransactionJournal after($date)
+ * @method static Builder|TransactionJournal before($date)
+ * @method static Builder|TransactionJournal onDate($date)
+ * @method static Builder|TransactionJournal transactionTypes($types)
+ * @method static Builder|TransactionJournal withRelevantData()
  */
 class TransactionJournal extends Model
 {
diff --git a/app/Models/TransactionRelation.php b/app/Models/TransactionRelation.php
deleted file mode 100644
index 058f395537..0000000000
--- a/app/Models/TransactionRelation.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php namespace FireflyIII\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-/**
- * Class TransactionRelation
- *
- * @package FireflyIII\Models
- */
-class TransactionRelation extends Model
-{
-
-    /**
-     * @return array
-     */
-    public function getDates()
-    {
-        return ['created_at', 'updated_at'];
-    }
-
-}
diff --git a/app/Models/TransactionType.php b/app/Models/TransactionType.php
index 0d7323835d..6df752b214 100644
--- a/app/Models/TransactionType.php
+++ b/app/Models/TransactionType.php
@@ -1,23 +1,19 @@
 <?php namespace FireflyIII\Models;
 
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
- * Class TransactionType
+ * FireflyIII\Models\TransactionType
  *
- * @package FireflyIII\Models
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property \Carbon\Carbon                                                                        $deleted_at
- * @property string                                                                                $type
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionJournals
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereDeletedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\Models\TransactionType whereType($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property Carbon                               $deleted_at
+ * @property string                               $type
+ * @property-read Collection|TransactionJournal[] $transactionJournals
  */
 class TransactionType extends Model
 {
diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php
index 6aca1f3cbb..85ec767e52 100644
--- a/app/Repositories/Budget/BudgetRepository.php
+++ b/app/Repositories/Budget/BudgetRepository.php
@@ -710,7 +710,6 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
      */
     public function spentPerBudgetPerAccount(Collection $budgets, Collection $accounts, Carbon $start, Carbon $end)
     {
-
         $accountIds = $accounts->pluck('id')->toArray();
         $budgetIds  = $budgets->pluck('id')->toArray();
         $set        = Auth::user()->transactionjournals()
@@ -740,8 +739,7 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
                           ->transactionTypes([TransactionType::WITHDRAWAL, TransactionType::TRANSFER, TransactionType::OPENING_BALANCE])
                           ->get(
                               [
-                                  't_from.account_id',
-                                  'budget_transaction_journal.budget_id',
+                                  't_from.account_id', 'budget_transaction_journal.budget_id',
                                   DB::Raw('SUM(`t_from`.`amount`) AS `spent`')
                               ]
                           );
diff --git a/app/Support/Steam.php b/app/Support/Steam.php
index de77081704..4a2a733355 100644
--- a/app/Support/Steam.php
+++ b/app/Support/Steam.php
@@ -77,9 +77,9 @@ class Steam
      *
      * [yyyy-mm-dd] => 123,2
      *
-     * @param Account $account
-     * @param Carbon  $start
-     * @param Carbon  $end
+     * @param \FireflyIII\Models\Account $account
+     * @param \Carbon\Carbon             $start
+     * @param \Carbon\Carbon             $end
      *
      * @return array
      */
diff --git a/app/User.php b/app/User.php
index 2fd0ae8fdf..d1924bbccc 100644
--- a/app/User.php
+++ b/app/User.php
@@ -1,43 +1,55 @@
 <?php namespace FireflyIII;
 
+use Carbon\Carbon;
+use FireflyIII\Models\Account;
+use FireflyIII\Models\Attachment;
+use FireflyIII\Models\Bill;
+use FireflyIII\Models\Budget;
+use FireflyIII\Models\Category;
+use FireflyIII\Models\Preference;
+use FireflyIII\Models\Role;
+use FireflyIII\Models\Tag;
+use FireflyIII\Models\TransactionJournal;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Query\Builder;
+use Illuminate\Support\Collection;
 use Zizaco\Entrust\Traits\EntrustUserTrait;
 
 /**
  * Class User
  *
  * @package FireflyIII
- * @property integer                                                                               $id
- * @property \Carbon\Carbon                                                                        $created_at
- * @property \Carbon\Carbon                                                                        $updated_at
- * @property string                                                                                $email
- * @property string                                                                                $password
- * @property string                                                                                $reset
- * @property string                                                                                $remember_token
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Account[]            $accounts
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Tag[]                $tags
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Bill[]               $bills
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Budget[]             $budgets
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Category[]           $categories
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Preference[]         $preferences
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\TransactionJournal[] $transactionjournals
- * @property-read \Illuminate\Database\Eloquent\Collection|\Config::get('entrust.role[] $roles
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereId($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereCreatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereUpdatedAt($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereEmail($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User wherePassword($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereReset($value)
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereRememberToken($value)
- * @property boolean                                                                               $blocked
- * @property-read \Illuminate\Database\Eloquent\Collection|\FireflyIII\Models\Attachment[]         $attachments
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlocked($value)
- * @property string                                                                                $blocked_code
- * @method static \Illuminate\Database\Query\Builder|\FireflyIII\User whereBlockedCode($value)
+ * @property integer                              $id
+ * @property Carbon                               $created_at
+ * @property Carbon                               $updated_at
+ * @property string                               $email
+ * @property string                               $password
+ * @property string                               $reset
+ * @property string                               $remember_token
+ * @property-read Collection|Account[]            $accounts
+ * @property-read Collection|Tag[]                $tags
+ * @property-read Collection|Bill[]               $bills
+ * @property-read Collection|Budget[]             $budgets
+ * @property-read Collection|Category[]           $categories
+ * @property-read Collection|Preference[]         $preferences
+ * @property-read Collection|TransactionJournal[] $transactionjournals
+ * @property-read Collection|Role                 $roles
+ * @method static Builder|User whereId($value)
+ * @method static Builder|User whereCreatedAt($value)
+ * @method static Builder|User whereUpdatedAt($value)
+ * @method static Builder|User whereEmail($value)
+ * @method static Builder|User wherePassword($value)
+ * @method static Builder|User whereReset($value)
+ * @method static Builder|User whereRememberToken($value)
+ * @property boolean                              $blocked
+ * @property-read Collection|Attachment[]         $attachments
+ * @method static Builder|User whereBlocked($value)
+ * @property string                               $blocked_code
+ * @method static Builder|User whereBlockedCode($value)
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract
 {