diff --git a/application/controllers/Expenses.php b/application/controllers/Expenses.php
index b41579017..9f852dae5 100644
--- a/application/controllers/Expenses.php
+++ b/application/controllers/Expenses.php
@@ -130,8 +130,8 @@ class Expenses extends Secure_Controller
 			'date' => $date_formatter->format('Y-m-d H:i:s'),
 			'supplier_name' => $this->input->post('supplier_name'),
 			'supplier_tax_code' => $this->input->post('supplier_tax_code'),
-			'amount' => $this->input->post('amount'),
-			'tax_amount' => $this->input->post('tax_amount'),
+			'amount' => parse_decimals($this->input->post('amount')),
+			'tax_amount' => parse_decimals($this->input->post('tax_amount')),
 			'payment_type' => $this->input->post('payment_type'),
 			'expense_category_id' => $this->input->post('expense_category_id'),
 			'description' => $this->input->post('description'),
diff --git a/application/models/Expense.php b/application/models/Expense.php
index a58595594..b962f50be 100644
--- a/application/models/Expense.php
+++ b/application/models/Expense.php
@@ -205,8 +205,7 @@ class Expense extends CI_Model
 	*/
 	public function save(&$expense_data, $expense_id = FALSE)
 	{
-		//$expense_id = $expense_data['expense_id'];
-		if(!$expense_id == -1 || !$this->exists($expense_id))
+		if(!$expense_id || !$this->exists($expense_id))
 		{
 			if($this->db->insert('expenses', $expense_data))
 			{
diff --git a/application/models/Giftcard.php b/application/models/Giftcard.php
index 416f24ac4..898bfedd6 100644
--- a/application/models/Giftcard.php
+++ b/application/models/Giftcard.php
@@ -109,9 +109,9 @@ class Giftcard extends CI_Model
 	/*
 	Inserts or updates a giftcard
 	*/
-	public function save(&$giftcard_data, $giftcard_id = -1)
+	public function save(&$giftcard_data, $giftcard_id = FALSE)
 	{
-		if($giftcard_id == -1 || !$this->exists($giftcard_id))
+		if(!$giftcard_id || !$this->exists($giftcard_id))
 		{
 			if($this->db->insert('giftcards', $giftcard_data))
 			{
diff --git a/application/models/Rewards.php b/application/models/Rewards.php
index 8303c2ca8..e965cfa87 100644
--- a/application/models/Rewards.php
+++ b/application/models/Rewards.php
@@ -9,9 +9,9 @@ class Rewards extends CI_Model
 	/*
 	Inserts or updates a rewards
 	*/
-	public function save(&$rewards_data, $id = -1)
+	public function save(&$rewards_data, $rewards_id = FALSE)
 	{
-		if($id == -1 || !$this->exists($id))
+		if(!$rewards_id || !$this->exists($rewards_id))
 		{
 			if($this->db->insert('sales_reward_points', $rewards_data))
 			{
@@ -23,7 +23,7 @@ class Rewards extends CI_Model
 			return FALSE;
 		}
 
-		$this->db->where('id', $id);
+		$this->db->where('id', $rewards_id);
 
 		return $this->db->update('sales_reward_points', $rewards_data);
 	}
diff --git a/application/models/Tax.php b/application/models/Tax.php
index ffc79a2ac..ab6b7bb3b 100644
--- a/application/models/Tax.php
+++ b/application/models/Tax.php
@@ -175,22 +175,23 @@ class Tax extends CI_Model
 			if($this->db->insert('tax_codes', $tax_code_data))
 			{
 				$this->save_tax_rates($tax_rate_data, $tax_code);
+
 				return TRUE;
 			}
-
-			return FALSE;
-		}
-
-		$this->db->where('tax_code', $tax_code);
-		if($this->db->update('tax_codes', $tax_code_data))
-		{
-			$this->save_tax_rates($tax_rate_data, $tax_code);
-			return TRUE;
 		}
 		else
 		{
-			return FALSE;
+			$this->db->where('tax_code', $tax_code);
+
+			if($this->db->update('tax_codes', $tax_code_data))
+			{
+				$this->save_tax_rates($tax_rate_data, $tax_code);
+
+				return TRUE;
+			}
 		}
+
+		return FALSE;
 	}
 
 	/**