diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index ccc4dc350ee7..4e6d72e9a5cb 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -322,11 +322,10 @@ class CheckData extends Command
             $total_invoice_payments = 0;
 
             foreach ($client->invoices as $invoice) {
-                info(print_r($invoice->payments,1));
-                $total_amount = $invoice->payments->sum('pivot.amount'); // the problem with this is that this also will sum the credits
+                $total_amount = $invoice->payments->sum('pivot.amount'); 
                 $total_refund = $invoice->payments->sum('pivot.refunded');
 
-                $total_invoice_payments += ($total_amount - $total_refund);
+                 $total_invoice_payments += ($total_amount - $total_refund);
             }
 
             foreach($client->payments as $payment)
diff --git a/app/Http/Controllers/BaseController.php b/app/Http/Controllers/BaseController.php
index 2e9266d1bea5..fc2c783e3102 100644
--- a/app/Http/Controllers/BaseController.php
+++ b/app/Http/Controllers/BaseController.php
@@ -202,7 +202,7 @@ class BaseController extends Controller
         $updated_at = date('Y-m-d H:i:s', $updated_at);
 
         $query->with(
-          [ 'user.company_users',
+          [
             'company' => function ($query) use ($updated_at) {
                 $query->whereNotNull('updated_at')->with('documents');
             },
diff --git a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
index 47305a2e964f..8c2de136a535 100644
--- a/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
+++ b/app/Http/ValidationRules/PaymentAmountsBalanceRule.php
@@ -73,6 +73,9 @@ class PaymentAmountsBalanceRule implements Rule
             return true;
         } // if no invoices are present, then this is an unapplied payment, let this pass validation!
 
+info("payment amounts = {$payment_amounts}");
+info("invoice amounts = {$invoice_amounts}");
+        //return true;
         return  $payment_amounts >= $invoice_amounts;
     }
 }
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index 78d0742cab2d..60adc5200b95 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -93,12 +93,18 @@ info("client paid to date {$client->paid_to_date}");
             }
 
             if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) {
-                 if ($data['amount'] == '') {
-                    $data['amount'] -= array_sum(array_column($data['credits'], 'amount'));
-                }
+                 
 
+                $_credit_totals = array_sum(array_column($data['credits'], 'amount'));
 
-                info("client paid to date {$client->paid_to_date}");
+                $data['amount'] -= $_credit_totals;
+
+                info("credit totals = {$_credit_totals}");
+
+                $client->service()->updatePaidToDate($_credit_totals)->save();
+            
+
+info("client paid to date {$client->paid_to_date}");
 
             }
 
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 7e0afe76b65c..2d60dbca4bd3 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -29,7 +29,7 @@ class CompanyUserTransformer extends EntityTransformer
     protected $defaultIncludes = [
     //     'account',
     //     'company',
-    //     'user',
+         'user',
     //     'token'
      ];