diff --git a/app/Http/Controllers/ExpenseController.php b/app/Http/Controllers/ExpenseController.php
index 9e100ffa992a..d2ad3dba5851 100644
--- a/app/Http/Controllers/ExpenseController.php
+++ b/app/Http/Controllers/ExpenseController.php
@@ -277,6 +277,8 @@ class ExpenseController extends BaseController
 
         event(new ExpenseWasUpdated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
+        event('eloquent.updated: App\Models\Expense', $expense);
+
         return $this->itemResponse($expense->fresh());
     }
 
@@ -369,6 +371,8 @@ class ExpenseController extends BaseController
 
         event(new ExpenseWasCreated($expense, $expense->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
+        event('eloquent.created: App\Models\Expense', $expense);
+
         return $this->itemResponse($expense);
     }
 
diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php
index 460d7fad0139..864ae6ef67c9 100644
--- a/app/Http/Controllers/ProjectController.php
+++ b/app/Http/Controllers/ProjectController.php
@@ -262,12 +262,14 @@ class ProjectController extends BaseController
 
         $project->fill($request->all());
         $project->number = empty($project->number) ? $this->getNextProjectNumber($project) : $project->number;
-        $project->save();
+        $project->saveQuietly();
 
         if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $project);
         }
 
+        event('eloquent.updated: App\Models\Project', $project);
+
         return $this->itemResponse($project->fresh());
     }
 
@@ -358,17 +360,19 @@ class ProjectController extends BaseController
     {
         $project = ProjectFactory::create(auth()->user()->company()->id, auth()->user()->id);
         $project->fill($request->all());
-        $project->save();
+        $project->saveQuietly();
 
         if (empty($project->number)) {
             $project->number = $this->getNextProjectNumber($project);
-            $project->save();
+            $project->saveQuietly();
         }
 
         if ($request->has('documents')) {
             $this->saveDocuments($request->input('documents'), $project);
         }
 
+        event('eloquent.created: App\Models\Project', $project);
+
         return $this->itemResponse($project->fresh());
     }
 
diff --git a/app/Http/Controllers/TaskController.php b/app/Http/Controllers/TaskController.php
index 57b279b58dde..b967ce8889e1 100644
--- a/app/Http/Controllers/TaskController.php
+++ b/app/Http/Controllers/TaskController.php
@@ -283,6 +283,8 @@ class TaskController extends BaseController
 
         event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
+        event('eloquent.updated: App\Models\Task', $task);
+
         return $this->itemResponse($task->fresh());
     }
 
@@ -376,6 +378,9 @@ class TaskController extends BaseController
 
         event(new TaskWasCreated($task, $task->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
 
+        event('eloquent.created: App\Models\Task', $task);
+
+
         return $this->itemResponse($task);
     }
 
diff --git a/app/Jobs/Util/WebhookHandler.php b/app/Jobs/Util/WebhookHandler.php
index 3c696e087d44..fae6d59d3a21 100644
--- a/app/Jobs/Util/WebhookHandler.php
+++ b/app/Jobs/Util/WebhookHandler.php
@@ -68,8 +68,6 @@ class WebhookHandler implements ShouldQueue
 
     public function failed($exception = null)
     {
-        if($exception)
-            nlog(print_r($exception->getMessage(), 1));
 
     }
 }
diff --git a/app/Jobs/Util/WebhookSingle.php b/app/Jobs/Util/WebhookSingle.php
index 7016cb53795f..d9d76cfc9ce2 100644
--- a/app/Jobs/Util/WebhookSingle.php
+++ b/app/Jobs/Util/WebhookSingle.php
@@ -245,7 +245,7 @@ class WebhookSingle implements ShouldQueue
     private function resolveClient()
     {
         //make sure it isn't an instance of the Client Model
-        if (! $this->entity instanceof ClientModel && ! $this->entity instanceof Product  && ! $this->entity instanceof Vendor && $this->entity->client()->exists()) {
+        if ($this->entity->client()->exists()) {
             return $this->entity->client;
         }
 
diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php
index e53a6d839952..25885a2bee79 100644
--- a/app/Models/Webhook.php
+++ b/app/Models/Webhook.php
@@ -44,21 +44,21 @@ class Webhook extends BaseModel
 
     const EVENT_UPDATE_VENDOR = 13; //tested
 
-    const EVENT_DELETE_VENDOR = 14; //
+    const EVENT_DELETE_VENDOR = 14; //tested
 
-    const EVENT_CREATE_EXPENSE = 15;
+    const EVENT_CREATE_EXPENSE = 15; //tested
 
-    const EVENT_UPDATE_EXPENSE = 16;
+    const EVENT_UPDATE_EXPENSE = 16; //tested
 
-    const EVENT_DELETE_EXPENSE = 17;
+    const EVENT_DELETE_EXPENSE = 17; //tested
 
-    const EVENT_CREATE_TASK = 18;
+    const EVENT_CREATE_TASK = 18; //tested
 
-    const EVENT_UPDATE_TASK = 19;
+    const EVENT_UPDATE_TASK = 19; //tested
 
-    const EVENT_DELETE_TASK = 20;
+    const EVENT_DELETE_TASK = 20; //tested
 
-    const EVENT_APPROVE_QUOTE = 21;
+    const EVENT_APPROVE_QUOTE = 21; //tested
 
     const EVENT_LATE_INVOICE = 22;
 
@@ -66,7 +66,7 @@ class Webhook extends BaseModel
 
     const EVENT_REMIND_INVOICE = 24;
 
-    const EVENT_PROJECT_CREATE = 25;
+    const EVENT_PROJECT_CREATE = 25;//
 
     const EVENT_PROJECT_UPDATE = 26;
 
diff --git a/app/Observers/ExpenseObserver.php b/app/Observers/ExpenseObserver.php
index 10c0b79d4387..f398f44e01da 100644
--- a/app/Observers/ExpenseObserver.php
+++ b/app/Observers/ExpenseObserver.php
@@ -27,13 +27,13 @@ class ExpenseObserver
      */
     public function created(Expense $expense)
     {
-        $subscriptions = Webhook::where('company_id', $expense->company->id)
+        $subscriptions = Webhook::where('company_id', $expense->company_id)
                             ->where('event_id', Webhook::EVENT_CREATE_EXPENSE)
                             ->exists();
 
-        if ($subscriptions) {
+        if ($subscriptions) 
             WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company)->delay(rand(1,5));
-        }
+        
     }
 
     /**
@@ -53,7 +53,7 @@ class ExpenseObserver
             $event = Webhook::EVENT_DELETE_EXPENSE; 
         
         
-        $subscriptions = Webhook::where('company_id', $expense->company->id)
+        $subscriptions = Webhook::where('company_id', $expense->company_id)
                                     ->where('event_id', $event)
                                     ->exists();
 
@@ -73,7 +73,7 @@ class ExpenseObserver
         if($expense->is_deleted)
             return;
 
-        $subscriptions = Webhook::where('company_id', $expense->company->id)
+        $subscriptions = Webhook::where('company_id', $expense->company_id)
                             ->where('event_id', Webhook::EVENT_ARCHIVE_EXPENSE)
                             ->exists();
 
diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php
index d08cd6a13976..e83d8c608f58 100644
--- a/app/Repositories/ExpenseRepository.php
+++ b/app/Repositories/ExpenseRepository.php
@@ -48,7 +48,7 @@ class ExpenseRepository extends BaseRepository
         if (empty($expense->number))
             $expense = $this->findAndSaveNumber($expense);
 
-        $expense->save();
+        $expense->saveQuietly();
 
         if (array_key_exists('documents', $data)) {
             $this->saveDocuments($data['documents'], $expense);
diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php
index 04f68b5f6867..4d5749a73db0 100644
--- a/app/Repositories/TaskRepository.php
+++ b/app/Repositories/TaskRepository.php
@@ -42,7 +42,7 @@ class TaskRepository extends BaseRepository
         }
 
         $task->fill($data);
-        $task->save();
+        $task->saveQuietly();
 
         if ($this->new_task && ! $task->status_id) {
             $this->setDefaultStatus($task);
@@ -121,7 +121,7 @@ class TaskRepository extends BaseRepository
         // $task->start_time = $task->start_time ?: $task->calcStartTime();
         // $task->duration = $task->calcDuration();
 
-        $task->save();
+        $task->saveQuietly();
 
         if (array_key_exists('documents', $data)) {
             $this->saveDocuments($data['documents'], $task);
@@ -183,7 +183,7 @@ class TaskRepository extends BaseRepository
             return $key >= $index;
         }))->each(function ($item, $key) {
             $item->status_order = $key;
-            $item->save();
+            $item->saveQuietly();
         });
     }
 
@@ -199,7 +199,7 @@ class TaskRepository extends BaseRepository
 
             $log = array_merge($log, [[time(), 0]]);
             $task->time_log = json_encode($log);
-            $task->save();
+            $task->saveQuietly();
         }
 
         $log = json_decode($task->time_log, true);
@@ -210,7 +210,7 @@ class TaskRepository extends BaseRepository
             $new = [time(), 0];
             $log = array_merge($log, [$new]);
             $task->time_log = json_encode($log);
-            $task->save();
+            $task->saveQuietly();
         }
 
         return $task;
@@ -229,7 +229,7 @@ class TaskRepository extends BaseRepository
             $log = array_merge($log, [$last]);
 
             $task->time_log = json_encode($log);
-            $task->save();
+            $task->saveQuietly();
         }
 
         return $task;
diff --git a/app/Services/Email/EmailMailer.php b/app/Services/Email/EmailMailer.php
index ab81f1fbec46..6d885db2db28 100644
--- a/app/Services/Email/EmailMailer.php
+++ b/app/Services/Email/EmailMailer.php
@@ -64,7 +64,6 @@ class EmailMailer implements ShouldQueue
 
     public function handle(): void
     {
-throw new \Exception("poopies");
 
     	MultiDB::setDb($this->email_service->company->db);