diff --git a/administrator/components/com_j2store/controllers/configurations.php b/administrator/components/com_j2store/controllers/configurations.php
index f9afb73..a9d72db 100755
--- a/administrator/components/com_j2store/controllers/configurations.php
+++ b/administrator/components/com_j2store/controllers/configurations.php
@@ -731,11 +731,11 @@ function add()
                     'options' => array('class' => 'btn-group'),
                     'desc' => 'J2STORE_CONF_J2STORE_AUTO_APPLY_SHIPPING_DESC'
                 ),
-                'hide_shipping_untill_address_selection' => array(
+                'hide_shipping_until_address_selection' => array(
                     'label' => 'J2STORE_CONF_AUTO_CALCULATE_SHIPPING_LABEL',
                     'type' => 'radio',
-                    'name' => 'hide_shipping_untill_address_selection',
-                    'value' => isset($vars->item->hide_shipping_untill_address_selection) && !is_null($vars->item->hide_shipping_untill_address_selection) ? $vars->item->hide_shipping_untill_address_selection : 1,
+                    'name' => 'hide_shipping_until_address_selection',
+                    'value' => isset($vars->item->hide_shipping_until_address_selection) && !is_null($vars->item->hide_shipping_until_address_selection) ? $vars->item->hide_shipping_until_address_selection : 1,
                     'options' => array('class' => 'btn-group'),
                     'desc' => 'J2STORE_CONF_AUTO_CALCULATE_SHIPPING_DESC'
                 ),
diff --git a/administrator/components/com_j2store/controllers/cpanels.php b/administrator/components/com_j2store/controllers/cpanels.php
index e2b79cf..50d48ae 100755
--- a/administrator/components/com_j2store/controllers/cpanels.php
+++ b/administrator/components/com_j2store/controllers/cpanels.php
@@ -135,7 +135,7 @@ public function migrate_order_coupons() {
 				}
 
 				if (count ( $migrated_coupons )) {
-					// now delete the records of succesfully migrated order coupons
+					// now delete the records of successfully migrated order coupons
 					$query = $db->getQuery ( true )->delete ( '#__j2store_ordercoupons' )->where ( 'j2store_ordercoupon_id IN (' . implode ( ',', $migrated_coupons ) . ')' );
 					$db->setQuery ( $query );
 					try {
@@ -195,7 +195,7 @@ public function migrate_order_vouchers() {
 				}
 
 				if (count ( $migrated_vouchers )) {
-					// now delete the records of succesfully migrated order coupons
+					// now delete the records of successfully migrated order coupons
 					$query = $db->getQuery ( true )->delete ( '#__j2store_voucherhistories' )->where ( 'j2store_voucherhistory_id IN (' . implode ( ',', $migrated_vouchers ) . ')' );
 					$db->setQuery ( $query );
 					try {
diff --git a/administrator/components/com_j2store/controllers/orders.php b/administrator/components/com_j2store/controllers/orders.php
index c521fcd..660cec9 100755
--- a/administrator/components/com_j2store/controllers/orders.php
+++ b/administrator/components/com_j2store/controllers/orders.php
@@ -562,7 +562,7 @@ function checkBillingInfo($order){
 		if(empty( $orderinfo ) || empty( $orderinfo->billing_first_name )){
 			//redirect to billing
 			$url ='index.php?option=com_j2store&view=orders&task=createOrder&layout=billing&oid='.$order->j2store_order_id;
-			$app->redirect ( $url,JText::_ ( 'J2STORE_BILLING_ADDRESS_REQUIRED' ),'waring' );
+			$app->redirect ( $url,JText::_ ( 'J2STORE_BILLING_ADDRESS_REQUIRED' ),'warning' );
 		}
 	}
 	/**
diff --git a/administrator/components/com_j2store/controllers/productbase.php b/administrator/components/com_j2store/controllers/productbase.php
index bfe84e0..7e22401 100755
--- a/administrator/components/com_j2store/controllers/productbase.php
+++ b/administrator/components/com_j2store/controllers/productbase.php
@@ -1207,8 +1207,8 @@ public function getVariantListAjax()
             $variantModel->setState('product_type', $item->product_type);
             $variant_list = $variantModel->product_id($product_id)->limit($limit)->limitstart($limitstart)->is_master(0)->getList();
             $variant_pagination = $variantModel->getPagination();
-            $lengths = $variantModel->getDimesions('lengths', 'j2store_length_id', 'length_title');
-            $weights = $variantModel->getDimesions('weights', 'j2store_weight_id', 'weight_title');
+            $lengths = $variantModel->getDimensions('lengths', 'j2store_length_id', 'length_title');
+            $weights = $variantModel->getDimensions('weights', 'j2store_weight_id', 'weight_title');
             $controller = F0FController::getTmpInstance('com_j2store', 'Products');
             $view = $controller->getView('Product', 'Html', 'J2StoreView');
             if ($model = $controller->getModel('Products', 'J2StoreModel')) {
diff --git a/administrator/components/com_j2store/controllers/shippingtroubles.php b/administrator/components/com_j2store/controllers/shippingtroubles.php
index 4f0985f..9f87f8c 100755
--- a/administrator/components/com_j2store/controllers/shippingtroubles.php
+++ b/administrator/components/com_j2store/controllers/shippingtroubles.php
@@ -37,7 +37,7 @@ public function browse()
 			}
 			$view = $this->getThisView();
 			$view->setModel($model);
-			$view->assign('shipping_avaliable',$shipping);
+			$view->assign('shipping_available',$shipping);
 			$view->assign('shipping_messages',$messages);
 			$view->setLayout($layout);
 		}elseif ($layout=='default_shipping_product'){
@@ -56,7 +56,7 @@ public function browse()
 			}
 			$view = $this->getThisView();
 			$view->setModel($model);
-			$view->assign('shipping_avaliable',$shipping);
+			$view->assign('shipping_available',$shipping);
 			$view->assign('products',$products);
 			$view->assign('state', $model->getState());
 			$view->setLayout($layout);
diff --git a/administrator/components/com_j2store/helpers/currency.php b/administrator/components/com_j2store/helpers/currency.php
index dc7a558..7692734 100755
--- a/administrator/components/com_j2store/helpers/currency.php
+++ b/administrator/components/com_j2store/helpers/currency.php
@@ -173,7 +173,7 @@ public function getDecimalPlace($currency = '') {
 		}
   	}
 
-	public function getThousandSysmbol($currency=''){
+	public function getThousandSymbol($currency=''){
 		if (!$currency) {
 			return $this->currencies[$this->code]['currency_thousands'];
 		} elseif ($currency && isset($this->currencies[$currency])) {
@@ -227,7 +227,7 @@ public static function getCurrenciesNumericCode($code){
   	/**
   	 * Method to get Numerice code
   	 * @param string $code alpha 3 digit code
-  	 * @return int numberic code
+  	 * @return int numeric code
   	 */
   	public static function getNumericCode(){
   		$result = array('AFN' => 4,
diff --git a/administrator/components/com_j2store/helpers/email.php b/administrator/components/com_j2store/helpers/email.php
index f284211..d05a918 100755
--- a/administrator/components/com_j2store/helpers/email.php
+++ b/administrator/components/com_j2store/helpers/email.php
@@ -40,7 +40,7 @@ public function getOrderEmails($order , $receiver_type = '*'){
 		/**
 		 * 1. Get order emails by type
 		 * 2. filter by language and process each mail template ( process tags )
-		 * 3. prepare the mailer for each template (intialize the mailer object)
+		 * 3. prepare the mailer for each template (initialize the mailer object)
 		 * 4. set the receivers ( customer emails / admins )
 		 * 5. return the array
 		 * */
@@ -151,7 +151,7 @@ protected function filterByLanguage($order, $mail_templates){
 				$default_template_group[] =  (object) $standard_template;
 			}
 		}
-		// sort by language prefernce
+		// sort by language preference
 		krsort($filtered_templates);
 
 		$result = $default_template_group ;
diff --git a/administrator/components/com_j2store/helpers/invoice.php b/administrator/components/com_j2store/helpers/invoice.php
index 3a44495..ebd9078 100755
--- a/administrator/components/com_j2store/helpers/invoice.php
+++ b/administrator/components/com_j2store/helpers/invoice.php
@@ -121,7 +121,7 @@ public function getInvoiceTemplates($order) {
 		return $allTemplates;
 	}
 
-	public function	getFormatedInvoice($order){
+	public function	getFormattedInvoice($order){
 		$text = $this->loadInvoiceTemplate($order);
 		$template =  J2Store::email()->processTags($text, $order, $extras=array());
 		return $template;
diff --git a/administrator/components/com_j2store/helpers/j2html.php b/administrator/components/com_j2store/helpers/j2html.php
index 9d91583..2a4fdc9 100755
--- a/administrator/components/com_j2store/helpers/j2html.php
+++ b/administrator/components/com_j2store/helpers/j2html.php
@@ -489,7 +489,7 @@ public static function input($type, $name, $value = null, $options = array())
 
         //assign the html
         $html = '';
-        //swtich the type of input
+        //switch the type of input
         switch ($type) {
 
             // return text input
@@ -859,7 +859,7 @@ public static function custom($type, $name, $value, $options = array())
         }elseif ($type == 'menuitem') {
             $html = self::menuItems($name, $value, $options);
         } elseif ($type == 'modal_article') {
-            $html = self::artical($name, $value, $options);
+            $html = self::article($name, $value, $options);
         } elseif ($type == 'enabled') {
             $id = isset($options['id']) && !empty($options['id']) ? $options['id'] : $name;
             $html = JHtmlSelect::booleanlist($name, $attr = array(), $value, $yes = 'JYES', $no = 'JNO', $id);
@@ -1121,7 +1121,7 @@ public static function getEditor($editor=''){
         return $my_editor;
     }
 
-    public static function artical($name, $value, $options){
+    public static function article($name, $value, $options){
         $platform = J2Store::platform();
         //
         $allowClear     = true;
@@ -1557,8 +1557,8 @@ protected static function getExpiryDate($valid_from, $valid_to)
     {
         $start = date("Y-m-d");
         $today = date_create($start);
-        //assing the coupon offer start date
-        // Assing the coupon valid date
+        //assign the coupon offer start date
+        // Assign the coupon valid date
         $date2 = date_create($valid_to);
         return date_diff($today, $date2);
     }
diff --git a/administrator/components/com_j2store/helpers/strapper.php b/administrator/components/com_j2store/helpers/strapper.php
index f5f4832..bbb4721 100755
--- a/administrator/components/com_j2store/helpers/strapper.php
+++ b/administrator/components/com_j2store/helpers/strapper.php
@@ -329,9 +329,9 @@ public static function getDateLocalisation($as_array=false) {
         $params = J2Store::config();
         $language = JFactory::getLanguage()->getTag();
         if($params->get('jquery_ui_localisation', 0) && strpos($language, 'en') === false) {
-            $platfrom = J2Store::platform();
+            $platform = J2Store::platform();
             //$doc = JFactory::getDocument();
-            $platfrom->addScript('jquery-ui-i18n','/ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/i18n/jquery-ui-i18n.min.js');
+            $platform->addScript('jquery-ui-i18n','/ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/i18n/jquery-ui-i18n.min.js');
            // $doc->addScript('//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/i18n/jquery-ui-i18n.min.js');
 
             //set the language default
@@ -339,7 +339,7 @@ public static function getDateLocalisation($as_array=false) {
             if(isset($tag[0]) && strlen($tag[0]) == 2) {
                 $script = "";
                 $script .= "(function($) { $.datepicker.setDefaults($.datepicker.regional['{$tag[0]}']); })(j2store.jQuery);";
-                $platfrom->addInlineScript($script);
+                $platform->addInlineScript($script);
                 //$doc->addScriptDeclaration($script);
             }
 
diff --git a/administrator/components/com_j2store/helpers/user.php b/administrator/components/com_j2store/helpers/user.php
index 79e6bfb..7c3334b 100755
--- a/administrator/components/com_j2store/helpers/user.php
+++ b/administrator/components/com_j2store/helpers/user.php
@@ -429,7 +429,7 @@ function validatePassword($password,$confirm_password,&$json){
 			}
 		}
 
-		// Minimum number of upper case ASII characters required
+		// Minimum number of upper case ASCII characters required
 		if (!empty($minimumUppercase))
 		{
 			$nUppercase = preg_match_all("/[A-Z]/", $password, $umatch);
diff --git a/administrator/components/com_j2store/helpers/utilities.php b/administrator/components/com_j2store/helpers/utilities.php
index 4087ba2..da5143c 100755
--- a/administrator/components/com_j2store/helpers/utilities.php
+++ b/administrator/components/com_j2store/helpers/utilities.php
@@ -66,7 +66,7 @@ public function isJson($string) {
 	/**
 	 * Method to convert an object or an array to csv
 	 * @param mixed $data array or object
-	 * @return string comma seperated value
+	 * @return string comma separated value
 	 */
 
 	public function to_csv($data) {
@@ -90,7 +90,7 @@ public function to_csv($data) {
 
 	/**
 	 * Method to format stock quantity
-	 * @param Float|Int $qty An int or a float value can be formated here.
+	 * @param Float|Int $qty An int or a float value can be formatted here.
 	 * @return mixed
 	 */
 
diff --git a/administrator/components/com_j2store/library/plugins/app.php b/administrator/components/com_j2store/library/plugins/app.php
index cdc68ec..d40944f 100755
--- a/administrator/components/com_j2store/library/plugins/app.php
+++ b/administrator/components/com_j2store/library/plugins/app.php
@@ -28,7 +28,7 @@ function __construct(&$subject, $config)
          *
          * The methods between here
          * and the next comment block are
-         * yours to modify by overrriding them in your shipping plugin
+         * yours to modify by overriding them in your shipping plugin
          *
          ************************************/
 
diff --git a/administrator/components/com_j2store/library/plugins/report.php b/administrator/components/com_j2store/library/plugins/report.php
index f277d91..e4de174 100755
--- a/administrator/components/com_j2store/library/plugins/report.php
+++ b/administrator/components/com_j2store/library/plugins/report.php
@@ -40,7 +40,7 @@ protected function includeCustomModels()
          *
          * The methods between here
          * and the next comment block are
-         * yours to modify by overrriding them in your shipping plugin
+         * yours to modify by overriding them in your shipping plugin
          *
          ************************************/
 
diff --git a/administrator/components/com_j2store/library/plugins/shipping.php b/administrator/components/com_j2store/library/plugins/shipping.php
index 15eb33f..50fc4d0 100755
--- a/administrator/components/com_j2store/library/plugins/shipping.php
+++ b/administrator/components/com_j2store/library/plugins/shipping.php
@@ -30,7 +30,7 @@ function __construct(&$subject, $config)
          *
          * The methods between here
          * and the next comment block are
-         * yours to modify by overrriding them in your shipping plugin
+         * yours to modify by overriding them in your shipping plugin
          *
          ************************************/
 
diff --git a/administrator/components/com_j2store/library/selectable/base.php b/administrator/components/com_j2store/library/selectable/base.php
index c0904da..77ce1b0 100755
--- a/administrator/components/com_j2store/library/selectable/base.php
+++ b/administrator/components/com_j2store/library/selectable/base.php
@@ -84,7 +84,7 @@ function show($field,$value){
 		return $html;
 	}
 
-	function getFormatedCustomFields($row, $layout='customfields', $type='billing') {
+	function getFormattedCustomFields($row, $layout='customfields', $type='billing') {
 
 		$app = JFactory::getApplication();
 
@@ -113,8 +113,8 @@ function getFormatedCustomFields($row, $layout='customfields', $type='billing')
 
 	}
 
-	function getFormatedDisplay($field, $value, $name, $translate=false, $options = '', $test = false, $allFields = null, $allValues = null) {						
-		$label = $this->getFieldName($field);		
+	function getFormattedDisplay($field, $value, $name, $translate=false, $options = '', $test = false, $allFields = null, $allValues = null) {
+		$label = $this->getFieldName($field);
 		$input = $this->display($field, $value, $name, $translate, $options, $test, $allFields, $allValues);
 		$html = $label.$input;
 		return $html;
@@ -128,7 +128,7 @@ function validate($formData, $area, $type='address') {
 		$data = J2Store::platform()->toObject($formData);
 		$fields = $this->getFields($area,$data,$type);
 		$json = array();
-		foreach ($fields as $field) {			
+		foreach ($fields as $field) {
 			$namekey = $field->field_namekey;
 			$field_type = $field->field_type;
 			if(substr($field->field_type,0,4) == 'plg.') {
@@ -145,7 +145,7 @@ function validate($formData, $area, $type='address') {
 				$val = $formData[$namekey];
 			} else {
 				$val = '';
-			}			
+			}
 			$error = $class->check($field,$val, $oldValue='');
 			if(!empty($error)) {
 				$json['error'][$namekey] = $error;
@@ -208,7 +208,7 @@ function prepareFields(&$fields,&$data,$type='user',$url='checkout&task=state',$
 				}
 
 			}
-			
+
 			$this->handleZone($fields,$test,$data);
 		}
 	}
@@ -242,7 +242,7 @@ function handleZone(&$fields,$test,$data){
 							$ok = true;
 						}
 						if($country_id) {
-							
+
 							$zoneType = new j2storeCountryType();
 							$zoneType->type = 'zone';
 							$zoneType->published = true;
@@ -347,15 +347,15 @@ function getCurrentURL($checkInRequest='',$safe=true){
 	}
 
 	function getFields($area,&$data,$type='user',$url='checkout&task=state', $notcoreonly=false){
-		$fields = $this->getData($area,$type, $notcoreonly);		
-		$this->prepareFields($fields,$data,$type,$url);		
+		$fields = $this->getData($area,$type, $notcoreonly);
+		$this->prepareFields($fields,$data,$type,$url);
 		return $fields;
 	}
 
 	/*
 	 * @area string display area - billing or shipping or payment
 	 * @type string field table type example: address
-	 * @notcoreonly boolen true for core fields
+	 * @notcoreonly boolean true for core fields
 	 */
 
 	function &getData($area,$type,$notcoreonly=false){
@@ -1012,11 +1012,11 @@ function translate($name){
 
 
 	function check(&$field,&$value, $oldvalue){
-		$error = '';		
+		$error = '';
 		if(!$field->field_required || is_array($value) || strlen($value) || strlen($oldvalue)){
 			return $error;
 		}
-		
+
 		if($this->report){
             $platform = J2Store::platform();
 			if(!$platform->isClient('administrator') || (isset($field->admin_display_error) && $field->admin_display_error)) {
@@ -1347,7 +1347,7 @@ function display($field, $value, $map, $inside, $options = '', $test = false, $a
 							break;
 						}
 					}
-						
+
 				}
 				//still no. Set it to store default.
 				if(empty($country)){
diff --git a/administrator/components/com_j2store/models/behavior/cartconfigurable.php b/administrator/components/com_j2store/models/behavior/cartconfigurable.php
index 64fe7cc..7c0e75d 100755
--- a/administrator/components/com_j2store/models/behavior/cartconfigurable.php
+++ b/administrator/components/com_j2store/models/behavior/cartconfigurable.php
@@ -40,11 +40,11 @@ public function onBeforeAddCartItem(&$model, $product, &$json) {
 		$product->product_options = $reloaded_product_options;
 		
 		$product_options = $product_helper->getProductOptions($product);
-		$ommit_check = array();
+		$omit_check = array();
 		//iterate through stored options for this product and validate
 		foreach($product_options as $product_option) {
 			$check_require= F0FModel::getTmpInstance('ProductOptions', 'J2StoreModel')->getItem($product_option['productoption_id']);
-			if($check_require->required && empty($check_option[$product_option['productoption_id']]) && $check_require->parent_id == 0 || in_array($product_option['productoption_id'], $ommit_check)){
+			if($check_require->required && empty($check_option[$product_option['productoption_id']]) && $check_require->parent_id == 0 || in_array($product_option['productoption_id'], $omit_check)){
 				$errors['error']['option'][$product_option['productoption_id']] = JText::sprintf('J2STORE_ADDTOCART_PRODUCT_OPTION_REQUIRED', JText::_($product_option['option_name']));
 			}
 			else if(array_key_exists($product_option['productoption_id'],$options))
@@ -59,7 +59,7 @@ public function onBeforeAddCartItem(&$model, $product, &$json) {
 									
 								if(count($attr['optionvalue']) > 0 && $attr['required'] && !array_key_exists($attr['productoption_id'],$options)) // if optionvalue exist or not. then only display form.otherwise form display only heading without option name
 								{
-									array_push($ommit_check,$attr['productoption_id']);
+									array_push($omit_check,$attr['productoption_id']);
 								}
 							}
 						}
@@ -73,7 +73,7 @@ public function onBeforeAddCartItem(&$model, $product, &$json) {
 			
 							if(count($attr['optionvalue']) > 0 && $attr['required'] && !array_key_exists($attr['productoption_id'],$options)) // if optionvalue exist or not. then only display form.otherwise form display only heading without option name
 							{
-								array_push($ommit_check,$attr['productoption_id']);
+								array_push($omit_check,$attr['productoption_id']);
 							}
 						}
 					}
diff --git a/administrator/components/com_j2store/models/behavior/configurable.php b/administrator/components/com_j2store/models/behavior/configurable.php
index defdb86..af3cfce 100755
--- a/administrator/components/com_j2store/models/behavior/configurable.php
+++ b/administrator/components/com_j2store/models/behavior/configurable.php
@@ -405,9 +405,9 @@ public function onUpdateProduct(&$model, &$product) {
 		$return ['pricing'] ['price'] = J2Store::product ()->displayPrice ( $price, $product, $params );
 		$return ['child_options'] = $response_option;
 		$return ['optionhtml'] = $html;
-		$return ['pricing'] ['orginal'] = array();
-		$return ['pricing'] ['orginal']['base_price'] = $base_price;
-		$return ['pricing'] ['orginal']['price'] = $price;
+		$return ['pricing'] ['original'] = array();
+		$return ['pricing'] ['original']['base_price'] = $base_price;
+		$return ['pricing'] ['original']['price'] = $price;
         J2Store::plugin()->event('AfterUpdateProductReturn',array(&$return,$product,$params));
 		return $return;
 	}
diff --git a/administrator/components/com_j2store/models/behavior/downloadable.php b/administrator/components/com_j2store/models/behavior/downloadable.php
index e3f6840..a6b8904 100755
--- a/administrator/components/com_j2store/models/behavior/downloadable.php
+++ b/administrator/components/com_j2store/models/behavior/downloadable.php
@@ -342,9 +342,9 @@ public function onUpdateProduct(&$model, &$product) {
 		$return ['pricing'] = array ();
 		$return ['pricing'] ['base_price'] = $product_helper->displayPrice ( $base_price, $product, $params );
 		$return ['pricing'] ['price'] = $product_helper->displayPrice ( $price, $product, $params );
-		$return ['pricing'] ['orginal'] = array();
-		$return ['pricing'] ['orginal']['base_price'] = $base_price;
-		$return ['pricing'] ['orginal']['price'] = $price;
+		$return ['pricing'] ['original'] = array();
+		$return ['pricing'] ['original']['base_price'] = $base_price;
+		$return ['pricing'] ['original']['price'] = $price;
         J2Store::plugin()->event('AfterUpdateProductReturn',array(&$return,$product,$params));
 		return $return;
 	}
diff --git a/administrator/components/com_j2store/models/behavior/flexivariable.php b/administrator/components/com_j2store/models/behavior/flexivariable.php
index ff15f9e..fc0e23b 100755
--- a/administrator/components/com_j2store/models/behavior/flexivariable.php
+++ b/administrator/components/com_j2store/models/behavior/flexivariable.php
@@ -17,8 +17,8 @@ public function onAfterGetItem(&$model, &$record) {
         $variantModel = F0FModel::getTmpInstance('Variants', 'J2StoreModel');
         $variantModel->setState('product_type', $record->product_type);
 
-        $record->lengths =$variantModel->getDimesions('lengths', 'j2store_length_id','length_title');
-        $record->weights = $variantModel->getDimesions('weights', 'j2store_weight_id','weight_title');
+        $record->lengths =$variantModel->getDimensions('lengths', 'j2store_length_id','length_title');
+        $record->weights = $variantModel->getDimensions('weights', 'j2store_weight_id','weight_title');
 
         try {
             //first load master variant
@@ -207,7 +207,7 @@ public function onAfterSave(&$model) {
             $platform = J2Store::platform();
             //save variable values
             if(isset($this->_rawData['variable'])){
-                foreach($this->_rawData['variable'] as $varient_key => $item){
+                foreach($this->_rawData['variable'] as $variant_key => $item){
 
                     if(is_array($item)){
                         $item = $platform->toObject($item);
@@ -260,9 +260,9 @@ public function onAfterSave(&$model) {
                     $variantChild->is_master = 0;
                     $item->product_id = $table->j2store_product_id;
                     $quantity_item = $item->quantity;
-                    $quantity_item->variant_id = $varient_key;
+                    $quantity_item->variant_id = $variant_key;
                     $quantity = F0FTable::getAnInstance('Productquantity','J2StoreTable')->getClone();
-                    $quantity->load(array('variant_id'=>$varient_key));
+                    $quantity->load(array('variant_id'=>$variant_key));
                     try {
                         if($variantChild->save($item)){
 
@@ -377,8 +377,8 @@ public function onAfterGetProduct(&$model, &$product) {
         $variantModel = F0FModel::getTmpInstance('Variants', 'J2StoreModel');
         $variantModel->setState('product_type', $product->product_type);
 
-        $product->lengths =$variantModel->getDimesions('lengths', 'j2store_length_id','length_title');
-        $product->weights = $variantModel->getDimesions('weights', 'j2store_weight_id','weight_title');
+        $product->lengths =$variantModel->getDimensions('lengths', 'j2store_length_id','length_title');
+        $product->weights = $variantModel->getDimensions('weights', 'j2store_weight_id','weight_title');
         try {
             //first load master variant
             $product->variants = $variantModel
@@ -675,9 +675,9 @@ public function onUpdateProduct(&$model, &$product) {
         $return['pricing'] = array();
         $return['pricing']['base_price'] = J2Store::product()->displayPrice($variant->pricing->base_price, $product, $params);
         $return['pricing']['price'] = J2Store::product()->displayPrice($variant->pricing->price, $product, $params);
-        $return ['pricing'] ['orginal'] = array();
-        $return ['pricing'] ['orginal']['base_price'] = $variant->pricing->base_price;
-        $return ['pricing'] ['orginal']['price'] = $variant->pricing->price;
+        $return ['pricing'] ['original'] = array();
+        $return ['pricing'] ['original']['base_price'] = $variant->pricing->base_price;
+        $return ['pricing'] ['original']['price'] = $variant->pricing->price;
         if($variant->pricing->base_price != $variant->pricing->price){
             $return['pricing']['class'] = 'show';
         }else{
diff --git a/administrator/components/com_j2store/models/behavior/simple.php b/administrator/components/com_j2store/models/behavior/simple.php
index b9a44f1..7099665 100755
--- a/administrator/components/com_j2store/models/behavior/simple.php
+++ b/administrator/components/com_j2store/models/behavior/simple.php
@@ -341,9 +341,9 @@ public function onUpdateProduct(&$model, &$product) {
 		$return ['pricing'] = array ();
 		$return ['pricing'] ['base_price'] = $product_helper->displayPrice ( $base_price, $product, $params );
 		$return ['pricing'] ['price'] = $product_helper->displayPrice ( $price, $product, $params );
-		$return ['pricing'] ['orginal'] = array();
-		$return ['pricing'] ['orginal']['base_price'] = $base_price;
-		$return ['pricing'] ['orginal']['price'] = $price;
+		$return ['pricing'] ['original'] = array();
+		$return ['pricing'] ['original']['base_price'] = $base_price;
+		$return ['pricing'] ['original']['price'] = $price;
         J2Store::plugin()->event('AfterUpdateProductReturn',array(&$return,$product,$params));
 		return $return;
 	}
diff --git a/administrator/components/com_j2store/models/behavior/variable.php b/administrator/components/com_j2store/models/behavior/variable.php
index c0991f4..5f66c89 100755
--- a/administrator/components/com_j2store/models/behavior/variable.php
+++ b/administrator/components/com_j2store/models/behavior/variable.php
@@ -18,8 +18,8 @@ public function onAfterGetItem(&$model, &$record) {
 		$variantModel->setState('product_type', $record->product_type);
 
 
-		$record->lengths =$variantModel->getDimesions('lengths', 'j2store_length_id','length_title');
-		$record->weights = $variantModel->getDimesions('weights', 'j2store_weight_id','weight_title');
+		$record->lengths =$variantModel->getDimensions('lengths', 'j2store_length_id','length_title');
+		$record->weights = $variantModel->getDimensions('weights', 'j2store_weight_id','weight_title');
 
 		try {
 			//first load master variant
@@ -184,7 +184,7 @@ public function onAfterSave(&$model) {
             $platform = J2Store::platform();
 			//save variable values
 			if(isset($this->_rawData['variable'])){
-				foreach($this->_rawData['variable'] as $varient_key => $item){
+				foreach($this->_rawData['variable'] as $variant_key => $item){
 
 					if(is_array($item)){
 						$item = $platform->toObject($item);
@@ -236,9 +236,9 @@ public function onAfterSave(&$model) {
 					$item->product_id = $table->j2store_product_id;
 					$quantity_item = $item->quantity;
 
-					$quantity_item->variant_id = $varient_key;
+					$quantity_item->variant_id = $variant_key;
 					$quantity = F0FTable::getAnInstance('Productquantity','J2StoreTable')->getClone();
-					$quantity->load(array('variant_id'=>$varient_key));
+					$quantity->load(array('variant_id'=>$variant_key));
 					try {
 						if($variantChild->save($item)){
 
@@ -581,9 +581,9 @@ public function onUpdateProduct(&$model, &$product) {
 		$return['pricing'] = array();
 		$return['pricing']['base_price'] = J2Store::product()->displayPrice($variant->pricing->base_price, $product, $params);
 		$return['pricing']['price'] = J2Store::product()->displayPrice($variant->pricing->price, $product, $params);
-		$return ['pricing'] ['orginal'] = array();
-		$return ['pricing'] ['orginal']['base_price'] = $variant->pricing->base_price;
-		$return ['pricing'] ['orginal']['price'] = $variant->pricing->price;
+		$return ['pricing'] ['original'] = array();
+		$return ['pricing'] ['original']['base_price'] = $variant->pricing->base_price;
+		$return ['pricing'] ['original']['price'] = $variant->pricing->price;
         if($variant->pricing->base_price != $variant->pricing->price){
             $return['pricing']['class'] = 'show';
         }else{
diff --git a/administrator/components/com_j2store/models/cartadmins.php b/administrator/components/com_j2store/models/cartadmins.php
index 3fe80b0..a49af67 100755
--- a/administrator/components/com_j2store/models/cartadmins.php
+++ b/administrator/components/com_j2store/models/cartadmins.php
@@ -61,7 +61,7 @@ public function addAdminCartItem() {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 			echo $e->getMessage();
 		}
@@ -110,7 +110,7 @@ public function addAdminCartItem() {
 							&$table
 					) );
 				} catch ( Exception $e ) {
-					// Oops, an exception occured!
+					// Oops, an exception occurred!
 					$this->setError ( $e->getMessage () );
 					return false;
 				}
@@ -191,7 +191,7 @@ public function addItem($item) {
 				}
 				catch (Exception $e)
 				{
-					// Oops, an exception occured!
+					// Oops, an exception occurred!
 					$this->setError($e->getMessage());
 					return false;
 				}
@@ -420,7 +420,7 @@ function update(){
 				if($cartitem->cart_id != $orderitem['cart_id']) continue;
 				
 				if ($this->validate ($cartitem, $orderitem ) === false) {
-					// an error occured. Return it
+					// an error occurred. Return it
 					$json ['error'] = $this->getError();
 					continue; // exit from the loop
 				}
@@ -483,7 +483,7 @@ function validate($cartitem, $orderitem) {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$result = false;
 			$this->setError($e->getMessage());
 		}
diff --git a/administrator/components/com_j2store/models/carts.php b/administrator/components/com_j2store/models/carts.php
index 3988024..35a8202 100755
--- a/administrator/components/com_j2store/models/carts.php
+++ b/administrator/components/com_j2store/models/carts.php
@@ -73,7 +73,7 @@ public function addCartItem() {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 			echo $e->getMessage();
 		}
@@ -135,7 +135,7 @@ public function addItem($item) {
 							&$table
 					) );
 				} catch ( Exception $e ) {
-					// Oops, an exception occured!
+					// Oops, an exception occurred!
 					$this->setError ( $e->getMessage () );
 					return false;
 				}
@@ -349,7 +349,7 @@ public function getItems($focrce = false) {
 					}
 					catch (Exception $e)
 					{
-						// Oops, an exception occured!
+						// Oops, an exception occurred!
 						$this->setError($e->getMessage());
 						return array();
 					}
@@ -380,7 +380,7 @@ function update() {
 			// get the difference quantity
 
 			if ($this->validate ($cartitem, $quantity ) === false) {
-				// an error occured. Return it
+				// an error occurred. Return it
 				$json ['error'] = $this->getError();
 				continue; // exit from the loop
 			}
@@ -467,7 +467,7 @@ function validate($cartitem, $quantity) {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$result = false;
 			$this->setError($e->getMessage());
 		}
diff --git a/administrator/components/com_j2store/models/coupons.php b/administrator/components/com_j2store/models/coupons.php
index 61ccdf3..c91d92c 100755
--- a/administrator/components/com_j2store/models/coupons.php
+++ b/administrator/components/com_j2store/models/coupons.php
@@ -41,7 +41,7 @@ protected function onBeforeSave(&$data, &$table) {
             $this->setError(JText::_("J2STORE_COUPON_VALID_FORM_DATE_NEED_TO_GRATER_THAN_COUPON VALID_TO_DATE"));
             $status = false;
         }
-        
+
 		if(isset($data['products']) && !empty($data['products'])){
             if(is_string($data['products'])){
                 $data['products'] = array($data['products']);
@@ -105,7 +105,7 @@ public function init() {
 			try {
 				$row = $db->loadObject ();
 			} catch ( Exception $e ) {
-				// an error occured
+				// an error occurred
 				$row = F0FTable::getInstance ( 'Coupon', 'J2StoreTable' );
 			}
 			$couponsets[$this->code] = $row;
@@ -199,7 +199,7 @@ public function is_admin_valid($order){
 		}
 		return true;
 	}
-	
+
 	/**
 	 * Check if a coupon is valid
 	 *
@@ -213,11 +213,11 @@ public function is_valid_for_cart() {
 	public function is_valid_for_product($product) {
 		if (! $this->is_type ( array (
 				'fixed_product',
-				'percentage_product' 
+				'percentage_product'
 		) )) {
 			return false;
 		}
-		
+
 		$valid = false;
 		$coupon_products_data = $this->get_selected_products ();
 		$coupon_categories_data = array ();
@@ -229,12 +229,12 @@ public function is_valid_for_product($product) {
 		if(!empty($this->coupon->brand_ids)) {
 			$brands = explode ( ',', $this->coupon->brand_ids);
 		}
-		
+
 		if (! count ( $coupon_categories_data ) && ! count ( $coupon_products_data ) && !count($brands)) {
 			// No product ids - all items discounted
 			$valid = true;
 		}
-		
+
 		if (count ( $coupon_products_data ) > 0) {
 			//selected products only
 			if (in_array ( $product->product_id, $coupon_products_data )) {
@@ -261,10 +261,10 @@ public function is_valid_for_product($product) {
 			}
 
 		}
-		
+
 		//manufacturers / brands
 		if(count($brands)){
-			$manufacturer_data = array ();			
+			$manufacturer_data = array ();
 				$manufacturer_id = isset($product->cartitem->manufacturer_id) ? $product->cartitem->manufacturer_id : '';
 				if(!empty($manufacturer_id ) && in_array($manufacturer_id, $brands)){
 					$manufacturer_data[] = $product->product_id;
@@ -273,12 +273,12 @@ public function is_valid_for_product($product) {
 					$valid = true;
 				}
 		}
-		
+
 		// allow plugins to modify the output
 		J2Store::plugin ()->event ( 'IsCouponValidForProduct', array (
 				$valid,
 				$product,
-				$this 
+				$this
 		) );
 		return $valid;
 	}
@@ -312,7 +312,7 @@ private function validate_usage_limit() {
 
 	private function validate_user_logged() {
 		$user = JFactory::getUser();
-		// is customer loged
+		// is customer logged
 		if ($this->coupon->logged && ! $user->id) {
 			throw new Exception( JText::_('J2STORE_COUPON_APPLICABLE_ONLY_FOR_LOGGED_IN_CUSTOMERS') );
 		}
@@ -333,7 +333,7 @@ private function validate_users() {
 
 		}
 	}
-	
+
 	/**
 	 * Method to validate the user group of the user as set in the coupon
 	 * */
@@ -443,7 +443,7 @@ private function validate_product_ids() {
 					}
 				}
 			}
-			
+
 			//products
 			if (count ( $coupon_products_data ) > 0) {
 				if (count ( $cartitems ) > 0) {
@@ -454,7 +454,7 @@ private function validate_product_ids() {
 					}
 				}
 			}
-			
+
 			//manufacturers
 			if(!empty($this->coupon->brand_ids)){
 				$brand_ids = explode(',' ,$this->coupon->brand_ids);
@@ -462,7 +462,7 @@ private function validate_product_ids() {
 				if(count($brand_ids)) {
 					foreach ( $cartitems as $item ) {
 						if(isset($item->manufacturer_id) && !empty($item->manufacturer_id) && in_array($item->manufacturer_id , $brand_ids)){
-							$manufacturer_data[] = $item->product_id;							
+							$manufacturer_data[] = $item->product_id;
 						}
 					}
 					if (count ( $manufacturer_data ) > 0) {
@@ -513,7 +513,7 @@ public function validate_admin_product_ids($order){
 										break;
 									}
 								}
-								
+
 							}
 						}
 						if ( count ( $product_data ) > 0 ) {
@@ -575,7 +575,7 @@ public function getCouponByCode($code) {
 		return $row;
 
 	}
-	
+
 	/**
 	 * Checks the coupon type.
 	 *
@@ -592,7 +592,7 @@ public function get_discount_amount($discounting_amount, $cartitem, $order, $sin
 		$params = J2Store::config ();
 		$session = JFactory::getSession ();
 		$cart_item_qty = is_null ( $cartitem ) ? 1 : $cartitem->orderitem_quantity;
-		
+
 		if ($this->is_type ( array ('percentage_product','percentage_cart') )) {
 			// percentage based discount. This is a very normal calculation
 			$discount = $this->coupon->value * ($discounting_amount / 100);
@@ -616,14 +616,14 @@ public function get_discount_amount($discounting_amount, $cartitem, $order, $sin
 			}
 			$discount = ($this->coupon->value * $discount_percent) / $cart_item_qty;
 		} elseif ($this->is_type ( 'fixed_product' )) {
-			
+
 			$discount = min ( $this->coupon->value, $discounting_amount );
 			$discount = $single ? $discount : $discount * $cart_item_qty;
 			// $discount = $this->coupon->value * ($discounting_amount / $sub_total);
 		}
-		
+
 		$discount = min ( $discount, $discounting_amount );
-		
+
 		// Handle the limit_usage_to_x_items option
 		if ($this->is_type ( array ('percentage_product','fixed_product') )) {
 			if ($discounting_amount) {
@@ -644,7 +644,7 @@ public function get_discount_amount($discounting_amount, $cartitem, $order, $sin
 		if ($this->coupon->free_shipping) {
 			$order->allow_free_shipping ();
 		}
-		
+
 		// allow plugins to modify the amount
 		J2Store::plugin ()->event ( 'GetCouponDiscountAmount', array (
 				$discount,
@@ -652,11 +652,11 @@ public function get_discount_amount($discounting_amount, $cartitem, $order, $sin
 				$cartitem,
 				$order,
 				$this,
-				$single 
+				$single
 		) );
 		return $discount;
 	}
-	
+
 	public function getCouponHistory() {
 		$app = JFactory::getApplication();
 		$id = $app->input->getInt('coupon_id', 0);
@@ -672,23 +672,23 @@ public function getCouponHistory() {
 		}
 		return $items;
 	}
-	
+
 	/**
 	 * Method to get coupon discount types. Third party developers can override by introducing new coupon value types.
 	 * @return array A list of key value pair
 	 */
-	
-	
-	public function getCouponDiscountTypes() {		
+
+
+	public function getCouponDiscountTypes() {
 		$list = array (
 				'percentage_cart' => JText::_ ( 'J2STORE_VALUE_TYPE_CART_DISCOUNT_PERCENTAGE' ),
 				'fixed_cart' => JText::_ ( 'J2STORE_VALUE_TYPE_CART_DISCOUNT_FIXED_PRICE' ),
 				'percentage_product' => JText::_ ( 'J2STORE_VALUE_TYPE_PRODUCT_PERCENTAGE' ),
-				'fixed_product' => JText::_ ( 'J2STORE_VALUE_TYPE_PRODUCT_FIXED_PRICE' ) 
+				'fixed_product' => JText::_ ( 'J2STORE_VALUE_TYPE_PRODUCT_FIXED_PRICE' )
 		);
 		//allow plugins to modify
 		J2Store::plugin()->event('GetCouponDiscountTypes', array(&$list));
-		return $list;	
+		return $list;
 	}
 
 	public function get_coupon(){
@@ -736,6 +736,6 @@ public function remove_coupon() {
 			$cart_table->cart_coupon = '';
 			$cart_table->store();
 		}
-		
+
 	}
 }
\ No newline at end of file
diff --git a/administrator/components/com_j2store/models/fields/couponexpiretext.php b/administrator/components/com_j2store/models/fields/couponexpiretext.php
index 1b68c80..5fd8a2b 100755
--- a/administrator/components/com_j2store/models/fields/couponexpiretext.php
+++ b/administrator/components/com_j2store/models/fields/couponexpiretext.php
@@ -41,8 +41,8 @@ public function getExpiryDate($valid_from,$valid_to)
 	{
 		$start=date("Y-m-d");
 		$today=date_create($start);
-		//assing the coupon offer start date
-		// Assing the coupon valid date
+		//assign the coupon offer start date
+		// Assign the coupon valid date
 		$date2=date_create($valid_to);
 		return date_diff($today,$date2);
 	}
diff --git a/administrator/components/com_j2store/models/myprofiles.php b/administrator/components/com_j2store/models/myprofiles.php
index 9d58b8e..ff81d71 100755
--- a/administrator/components/com_j2store/models/myprofiles.php
+++ b/administrator/components/com_j2store/models/myprofiles.php
@@ -10,7 +10,7 @@ class J2StoreModelMyProfiles extends F0FModel {
 
 	/**
 	 *  Method for building Query object
-	 *  @retun Query object joomla's default query Object
+	 *  @return Query object joomla's default query Object
 	 */
 	public function getAddress()
 	{
diff --git a/administrator/components/com_j2store/models/orderdownloads.php b/administrator/components/com_j2store/models/orderdownloads.php
index 62a3f09..1d2dd13 100755
--- a/administrator/components/com_j2store/models/orderdownloads.php
+++ b/administrator/components/com_j2store/models/orderdownloads.php
@@ -341,7 +341,7 @@ public function downloadFile($file, $mask='') {
 
 		header("Accept-Ranges: bytes");
 
-		$range = 0; // default to begining of file
+		$range = 0; // default to beginning of file
 		//TODO make the download speed configurable
 		$size=filesize($file);
 
@@ -364,7 +364,7 @@ public function downloadFile($file, $mask='') {
 			header("Content-Length: ".$size);
 		}
 
-		//check to ensure it is not an empty file so the feof does not get stuck in an infinte loop.
+		//check to ensure it is not an empty file so the feof does not get stuck in an infinite loop.
 		if ($size == 0 ) {
             J2Store::platform()->raiseError(500,'ERROR.ZERO_BYTE_FILE');
 			exit;
diff --git a/administrator/components/com_j2store/models/orders.php b/administrator/components/com_j2store/models/orders.php
index c3e7ff4..750c406 100755
--- a/administrator/components/com_j2store/models/orders.php
+++ b/administrator/components/com_j2store/models/orders.php
@@ -90,7 +90,7 @@ function validateOrder(&$order) {
 
 		//validate shipping
 
-		//set shiping address
+		//set shipping address
 		if($user->id && $session->has('shipping_address_id', 'j2store')) {
 			$shipping_address = $address_model->getItem($session->get('shipping_address_id', '', 'j2store'));
 		} elseif($session->has('guest', 'j2store')) {
diff --git a/administrator/components/com_j2store/models/products.php b/administrator/components/com_j2store/models/products.php
index d38d957..077b438 100755
--- a/administrator/components/com_j2store/models/products.php
+++ b/administrator/components/com_j2store/models/products.php
@@ -197,7 +197,7 @@ public function getProduct($product) {
         }
         catch (Exception $e)
         {
-            // Oops, an exception occured!
+            // Oops, an exception occurred!
             $this->setError($e->getMessage());
         }
 
@@ -209,7 +209,7 @@ public function getProduct($product) {
         }
         catch (Exception $e)
         {
-            // Oops, an exception occured!
+            // Oops, an exception occurred!
             $this->setError($e->getMessage());
         }
         return $product;
@@ -249,7 +249,7 @@ public function updateProduct() {
         }
         catch (Exception $e)
         {
-            // Oops, an exception occured!
+            // Oops, an exception occurred!
             $this->setError($e->getMessage());
             return false;
         }
@@ -1050,7 +1050,7 @@ function _buildSortQuery(&$query){
 
     public function getSortFields()
     {
-        //containes sorting fields
+        //contains sorting fields
         //both in ascending and descending
 
         return array(
diff --git a/administrator/components/com_j2store/models/producttags.php b/administrator/components/com_j2store/models/producttags.php
index 40ed2fc..60b1387 100755
--- a/administrator/components/com_j2store/models/producttags.php
+++ b/administrator/components/com_j2store/models/producttags.php
@@ -108,7 +108,7 @@ public function getProduct($product) {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 		}
 
@@ -120,7 +120,7 @@ public function getProduct($product) {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 		}
 		return $product;
@@ -160,7 +160,7 @@ public function updateProduct() {
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 			return false;
 		}
@@ -273,7 +273,7 @@ function _buildSortQuery(&$query){
 
 	public function getSortFields()
 	{
-		//containes sorting fields
+		//contains sorting fields
 		//both in ascending and descending
 
 		return array(
diff --git a/administrator/components/com_j2store/models/shippingtroubles.php b/administrator/components/com_j2store/models/shippingtroubles.php
index ca9f60e..c62ae41 100755
--- a/administrator/components/com_j2store/models/shippingtroubles.php
+++ b/administrator/components/com_j2store/models/shippingtroubles.php
@@ -18,9 +18,9 @@ public function buildQuery($overrideLimits = false) {
 		$db = JFactory::getDbo();
 		$query = $db->getQuery(true);
 		$query->select('#__j2store_products.*')->from('#__j2store_products');
-		$this->_buldQueryJoin($query);
-        $this->_buldQueryGroup($query);
-		$this->_buldQueryWhere($query);
+		$this->_buildQueryJoin($query);
+        $this->_buildQueryGroup($query);
+		$this->_buildQueryWhere($query);
         if(!empty($this->state->filter_order) && in_array($this->state->filter_order,array('j2store_product_id','created_on'))) {
             if(!in_array(strtolower($this->state->filter_order_Dir),array('asc','desc'))){
                 $this->state->filter_order_Dir = 'desc';
@@ -35,11 +35,11 @@ public function buildQuery($overrideLimits = false) {
 		return $query;
 	}
 	
-	function _buldQueryJoin($query){
+	function _buildQueryJoin($query){
 		$query->select('#__j2store_variants.sku,#__j2store_variants.price,#__j2store_variants.shipping,#__j2store_variants.length,#__j2store_variants.width,#__j2store_variants.height,#__j2store_variants.length_class_id,#__j2store_variants.weight_class_id,#__j2store_variants.weight');
 		$query->join('INNER','#__j2store_variants ON #__j2store_products.j2store_product_id = #__j2store_variants.product_id');
     }
-    function _buldQueryGroup($query){
+    function _buildQueryGroup($query){
         $query->group('#__j2store_products.j2store_product_id');
     }
 	/**
@@ -53,7 +53,7 @@ private function getFilterValues()
 		);
 	}
 	
-	function _buldQueryWhere($query){
+	function _buildQueryWhere($query){
 		$db = $this->_db;
 		$state = $this->getFilterValues();
 		$query->where('#__j2store_products.enabled='.$this->_db->q(1));
diff --git a/administrator/components/com_j2store/models/variants.php b/administrator/components/com_j2store/models/variants.php
index 2942f42..5fbb62c 100755
--- a/administrator/components/com_j2store/models/variants.php
+++ b/administrator/components/com_j2store/models/variants.php
@@ -84,7 +84,7 @@ public function getTableFields()
 	 * @param string $column
 	 * @param string $key
 	 */
-	public function getDimesions($table_name,$column ,$key){
+	public function getDimensions($table_name,$column ,$key){
 		$db= JFactory::getDbo();
 		$table = '#__j2store_'.$table_name;
 		$query = $db->getQuery(true);
diff --git a/administrator/components/com_j2store/models/vouchers.php b/administrator/components/com_j2store/models/vouchers.php
index 46e1e78..89aeff8 100755
--- a/administrator/components/com_j2store/models/vouchers.php
+++ b/administrator/components/com_j2store/models/vouchers.php
@@ -339,7 +339,7 @@ public function sendVouchers($cids) {
 			//Allow plugins to modify
 			J2Store::plugin ()->event ( 'BeforeSendVoucher', array ($voucherTable,&$mailer));			
 			if($mailer->Send () !== true) {
-				$this->setError(JText::sprintf('J2STORE_VOUCHERS_SENDING_FAILED_TO_RECEIPIENT', $voucherTable->email_to));
+				$this->setError(JText::sprintf('J2STORE_VOUCHERS_SENDING_FAILED_TO_RECIPIENT', $voucherTable->email_to));
 				$failed++;
 			}
 			
diff --git a/administrator/components/com_j2store/tables/order.php b/administrator/components/com_j2store/tables/order.php
index a58e1c5..e0c48ab 100755
--- a/administrator/components/com_j2store/tables/order.php
+++ b/administrator/components/com_j2store/tables/order.php
@@ -982,7 +982,7 @@ public function getOrderShippingTotals ()
 
 			$shipping_totals = array();
 
-			//get exisitng values
+			//get existing values
 			$shipping_values = $session->get ( 'shipping_values', array(), 'j2store' );
 			$rates = F0FModel::getTmpInstance ( 'Shippings', 'J2StoreModel' )->getShippingRates ( $this );
 			$session->set ( 'shipping_methods', $rates, 'j2store' );
@@ -1067,7 +1067,7 @@ function setOrderInformation ()
 		$session = JFactory::getSession ();
 		$address_model = F0FModel::getTmpInstance ( 'Addresses', 'J2StoreModel' );
 
-		//set shiping address
+		//set shipping address
 		if ( $user->id && $session->has ( 'shipping_address_id', 'j2store' ) ) {
 			$shipping_address = $address_model->getAddressById ( $session->get ( 'shipping_address_id', '', 'j2store' ) );
 		} elseif ( $session->has ( 'guest', 'j2store' ) ) {
@@ -1718,7 +1718,7 @@ function saveOrder ()
 	/**
 	 * Update an existing order. This normally happens during the checkout.
 	 * Customer will reach final step. The order will be saved. if he then changes something before proceeding to payment
-	 * Then only exisitng order will get updated.
+	 * Then only existing order will get updated.
 	 *
 	 */
 
diff --git a/administrator/components/com_j2store/tables/variant.php b/administrator/components/com_j2store/tables/variant.php
index 9b444bf..e1238ee 100755
--- a/administrator/components/com_j2store/tables/variant.php
+++ b/administrator/components/com_j2store/tables/variant.php
@@ -20,17 +20,17 @@ public function __construct($table, $key, &$db, $config=array())
 			->select($db->qn('#__j2store_productquantities').'.j2store_productquantity_id ')
 			->select($db->qn('#__j2store_productquantities').'.quantity')
 			->join('LEFT OUTER', '#__j2store_productquantities ON #__j2store_productquantities.variant_id = #__j2store_variants.j2store_variant_id')
-		
+
 			->select($db->qn('#__j2store_lengths').'.length_title')
 			->select($db->qn('#__j2store_lengths').'.length_unit')
 			->select($db->qn('#__j2store_lengths').'.length_value')
 			->join('LEFT OUTER', '#__j2store_lengths ON #__j2store_lengths.j2store_length_id = #__j2store_variants.length_class_id')
-		
+
 			->select($db->qn('#__j2store_weights').'.weight_title')
 			->select($db->qn('#__j2store_weights').'.weight_unit')
 			->select($db->qn('#__j2store_weights').'.weight_value')
 			->join('LEFT OUTER', '#__j2store_weights ON #__j2store_weights.j2store_weight_id = #__j2store_variants.weight_class_id');
-		
+
 		$this->setQueryJoin($query);
 		parent::__construct($table, $key, $db, $config);
 	}
@@ -70,9 +70,9 @@ public function set_stock($qty, $mode='set') {
 
 			$productquantity->store();
 			$this->quantity = $productquantity->quantity;
-			
-			//set the availability to true. Otherwise validateStock method will return true or false. 
-			//This will not harm any other process because the following check is itself for seting the very same availability.
+
+			//set the availability to true. Otherwise validateStock method will return true or false.
+			//This will not harm any other process because the following check is itself for setting the very same availability.
 			$this->availability = 1;
 			if(!J2Store::product()->check_stock_status($this, 1)) {
 				$this->set_stock_status(0);
@@ -100,14 +100,14 @@ public function set_stock_status($status) {
 		$this->availability = $status;
 		$this->store();
 	}
-	
-	protected function onBeforeStore($updateNulls = false) {		
+
+	protected function onBeforeStore($updateNulls = false) {
 		if(!isset($this->sku) || empty($this->sku)) {
 			//sku is empty. Auto generate it based on product name
 			$product_helper = J2Store::product();
 			$this->sku = $product_helper->generateSKU($this);
 		}
-		
+
 		return parent::onBeforeStore($updateNulls);
 	}
 
@@ -124,7 +124,7 @@ protected function onBeforeDelete($id) {
 				$this->setError($e->getMessage);
 				return false;
 			}
-				
+
 			/* $productQuantity = F0FTable::getInstance('ProductQuantity', 'J2StoreTable')->load(array('variant_id'=>$id));
 			if(isset($productQuantity->j2store_productquantity_id)) {
 				F0FModel::getTmpInstance('ProductQuantities', 'J2StoreModel')->setId($productQuantity->j2store_productquantity_id)->delete();
@@ -134,12 +134,12 @@ protected function onBeforeDelete($id) {
 			$productPrices = F0FModel::getTmpInstance('ProductPrices', 'J2StoreModel')->limit(0)->limitstart(0)->variant_id($id)->getItemList();
 			foreach ($productPrices as $price) {
 				if($price->variant_id == $id) {
-					F0FTable::getAnInstance('ProductPrice', 'J2StoreTable')->delete($price->j2store_productprice_id);					
+					F0FTable::getAnInstance('ProductPrice', 'J2StoreTable')->delete($price->j2store_productprice_id);
 				}
 			}
 
 			//variant product option values
-			
+
 			$query = $db->getQuery(true)->delete('#__j2store_product_variant_optionvalues')->where($db->qn('variant_id').' = '.$db->q($id));
 			$db->setQuery($query);
 			try {
diff --git a/administrator/components/com_j2store/views/coupon/tmpl/products.php b/administrator/components/com_j2store/views/coupon/tmpl/products.php
index b463bee..6d54300 100755
--- a/administrator/components/com_j2store/views/coupon/tmpl/products.php
+++ b/administrator/components/com_j2store/views/coupon/tmpl/products.php
@@ -123,7 +123,7 @@
 
 Joomla.submitform =function(){
 	var pressbutton =  jQuery("#task").val();
-	// depricated in joomla 3.4.x
+	// deprecated in joomla 3.4.x
 	 //submitform(pressbutton);
 	 jQuery('#productadminForm').submit();
 };
diff --git a/administrator/components/com_j2store/views/cpanel/tmpl/default.php b/administrator/components/com_j2store/views/cpanel/tmpl/default.php
index 50d81bf..8767121 100755
--- a/administrator/components/com_j2store/views/cpanel/tmpl/default.php
+++ b/administrator/components/com_j2store/views/cpanel/tmpl/default.php
@@ -133,5 +133,4 @@
 		});
 
 	})(j2store.jQuery);
-
-}, 2000);');
\ No newline at end of file
+}, 2000);');
diff --git a/administrator/components/com_j2store/views/customer/tmpl/editaddress.php b/administrator/components/com_j2store/views/customer/tmpl/editaddress.php
index 815391f..4b585d7 100755
--- a/administrator/components/com_j2store/views/customer/tmpl/editaddress.php
+++ b/administrator/components/com_j2store/views/customer/tmpl/editaddress.php
@@ -46,7 +46,7 @@
                 <?php if(property_exists($address, $fieldName)):
                     $fieldName_prefix = $fieldName;
                     if(($fieldName !='email')){
-                        $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormatedDisplay($oneExtraField,$address->$fieldName,$fieldName_prefix,false, $options = '', $test = false, $allFields, $allValues = null),$html);
+                        $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormattedDisplay($oneExtraField,$address->$fieldName,$fieldName_prefix,false, $options = '', $test = false, $allFields, $allValues = null),$html);
                     }
                     ?>
                 <?php endif;?>
@@ -80,7 +80,7 @@
                             <?php if(property_exists($address, $fieldName)): ?>
                                 <?php
                                 if(($fieldName !='email')){
-                                    $uhtml .= $this->fieldClass->getFormatedDisplay($oneExtraField,$address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
+                                    $uhtml .= $this->fieldClass->getFormattedDisplay($oneExtraField,$address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
                                 }
                                 ?>
                             <?php endif;?>
diff --git a/administrator/components/com_j2store/views/order/tmpl/address.php b/administrator/components/com_j2store/views/order/tmpl/address.php
index 5ae4105..250ef81 100755
--- a/administrator/components/com_j2store/views/order/tmpl/address.php
+++ b/administrator/components/com_j2store/views/order/tmpl/address.php
@@ -51,7 +51,7 @@
 			<?php if(property_exists($this->orderinfo, $fieldName)):
 			$fieldName_prefix =$this->address_type.'_'.$fieldName;
 			if(($fieldName !='email')){
-			 	$html = str_replace('['.$fieldName.']',$this->fieldClass->getFormatedDisplay($oneExtraField,$this->orderinfo->$fieldName,$fieldName_prefix,false, $options = '', $test = false, $allFields, $allValues = null),$html);
+			 	$html = str_replace('['.$fieldName.']',$this->fieldClass->getFormattedDisplay($oneExtraField,$this->orderinfo->$fieldName,$fieldName_prefix,false, $options = '', $test = false, $allFields, $allValues = null),$html);
 			}
 			?>
 		<?php endif;?>
@@ -85,7 +85,7 @@
 						<?php if(property_exists($this->orderinfo, $fieldName)): ?>
 							<?php
 								if(($fieldName !='email')){
-									$uhtml .= $this->fieldClass->getFormatedDisplay($oneExtraField,$this->orderinfo->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
+									$uhtml .= $this->fieldClass->getFormattedDisplay($oneExtraField,$this->orderinfo->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
 								}
 								 ?>
 						<?php endif;?>
diff --git a/administrator/components/com_j2store/views/order/tmpl/form_customer.php b/administrator/components/com_j2store/views/order/tmpl/form_customer.php
index e2b03e3..a3083ad 100755
--- a/administrator/components/com_j2store/views/order/tmpl/form_customer.php
+++ b/administrator/components/com_j2store/views/order/tmpl/form_customer.php
@@ -68,7 +68,7 @@
 							echo $this->orderinfo->billing_tax_number ? JText::_('J2STORE_ADDRESS_TAX_NUMBER').':&nbsp;'.$this->orderinfo->billing_tax_number."</br>" : "";
 							?>
 
-							<?php echo J2Store::getSelectableBase()->getFormatedCustomFields($this->orderinfo, 'customfields', 'billing'); ?>
+							<?php echo J2Store::getSelectableBase()->getFormattedCustomFields($this->orderinfo, 'customfields', 'billing'); ?>
 
 						</td>
 						<td>
@@ -86,7 +86,7 @@
 						echo '<br/> ';
 						echo $this->orderinfo->shipping_company ? JText::_('J2STORE_ADDRESS_COMPANY_NAME').':&nbsp;'.$this->orderinfo->shipping_company."</br>" : "";
 						echo $this->orderinfo->shipping_tax_number ? JText::_('J2STORE_ADDRESS_TAX_NUMBER').':&nbsp;'.$this->orderinfo->shipping_tax_number."</br>" : "";
-						?> <?php echo J2Store::getSelectableBase()->getFormatedCustomFields($this->orderinfo, 'customfields', 'shipping'); ?>
+						?> <?php echo J2Store::getSelectableBase()->getFormattedCustomFields($this->orderinfo, 'customfields', 'shipping'); ?>
 						</td>
 					</tr>
 				</table>
diff --git a/administrator/components/com_j2store/views/order/tmpl/form_payment.php b/administrator/components/com_j2store/views/order/tmpl/form_payment.php
index febcd6e..42b923a 100755
--- a/administrator/components/com_j2store/views/order/tmpl/form_payment.php
+++ b/administrator/components/com_j2store/views/order/tmpl/form_payment.php
@@ -35,7 +35,7 @@
 		<tr>
 			<td colspan="2">
 
-				<?php $pay_html =  trim(J2Store::getSelectableBase()->getFormatedCustomFields($this->orderinfo, 'customfields', 'payment'));?>
+				<?php $pay_html =  trim(J2Store::getSelectableBase()->getFormattedCustomFields($this->orderinfo, 'customfields', 'payment'));?>
 				<?php if($pay_html ):?>
 					<div class="center">
 						<strong><?php echo JText::_('J2STORE_PAYMENT_ADDRESS');?></strong>
diff --git a/administrator/components/com_j2store/views/order/tmpl/order_billing.php b/administrator/components/com_j2store/views/order/tmpl/order_billing.php
index f0b08c5..a9f058d 100755
--- a/administrator/components/com_j2store/views/order/tmpl/order_billing.php
+++ b/administrator/components/com_j2store/views/order/tmpl/order_billing.php
@@ -70,8 +70,8 @@
 							if(($fieldName !='email')){ ?>
 						<?php //$fieldName_prefix =$this->address_type.'_'.$fieldName;
 						$oneExtraField->display_label = 'yes';?>
-						 <?php $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName,$fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
-						//$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->billing_orderinfo->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
+						 <?php $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName,$fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
+						//$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->billing_orderinfo->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
 						}
 					?>
 				<?php endif;?>
@@ -109,7 +109,7 @@
 										$oneExtraField->display_label = 'yes';
 										if(($fieldName !='email')){
 
-											$uhtml .= $this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
+											$uhtml .= $this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
 										}
 										 ?>
 								<?php endif;?>
@@ -149,7 +149,7 @@
 							echo $this->orderinfo->billing_tax_number ? JText::_('J2STORE_ADDRESS_TAX_NUMBER').':&nbsp;'.$this->orderinfo->billing_tax_number."</br>" : "";
 							?>
 						</address>
-							<?php echo J2Store::getSelectableBase()->getFormatedCustomFields($this->orderinfo, 'customfields', 'billing'); ?>
+							<?php echo J2Store::getSelectableBase()->getFormattedCustomFields($this->orderinfo, 'customfields', 'billing'); ?>
 				<br/>
 				<button id="change_address" class="btn btn-warning"><?php echo JText::_("J2STORE_CHOOSE_ALTERNATE_ADDRESS");?></button>
 				<br/>
diff --git a/administrator/components/com_j2store/views/order/tmpl/order_shipping.php b/administrator/components/com_j2store/views/order/tmpl/order_shipping.php
index 7b470e6..6035561 100755
--- a/administrator/components/com_j2store/views/order/tmpl/order_shipping.php
+++ b/administrator/components/com_j2store/views/order/tmpl/order_shipping.php
@@ -68,7 +68,7 @@
 						if(property_exists($this->address, $fieldName)):
 							if(($fieldName !='email')){ ?>
 						<?php $oneExtraField->display_label = 'yes';?>
-						 <?php $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName,$fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
+						 <?php $html = str_replace('['.$fieldName.']',$this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName,$fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
 						}
 					?>
 				<?php endif;?>
@@ -101,7 +101,7 @@
 									<?php
 									$oneExtraField->display_label = 'yes';
 										if(($fieldName !='email')){
-											$uhtml .= $this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
+											$uhtml .= $this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
 										}
 										 ?>
 								<?php endif;?>
@@ -141,7 +141,7 @@
 							echo $this->orderinfo->shipping_tax_number ? JText::_('J2STORE_ADDRESS_TAX_NUMBER').':&nbsp;'.$this->orderinfo->shipping_tax_number."</br>" : "";
 							?>
 						</address>
-							<?php echo J2Store::getSelectableBase()->getFormatedCustomFields($this->orderinfo, 'customfields', 'shipping'); ?>
+							<?php echo J2Store::getSelectableBase()->getFormattedCustomFields($this->orderinfo, 'customfields', 'shipping'); ?>
 					<button id="change_address" class="btn btn-warning"><?php echo JText::_("J2STORE_CHOOSE_ALTERNATE_ADDRESS");?></button>
 					<br/>
 					<br/>
diff --git a/administrator/components/com_j2store/views/product/tmpl/form_flexivariablevariants.php b/administrator/components/com_j2store/views/product/tmpl/form_flexivariablevariants.php
index 7439b26..6efc4ac 100755
--- a/administrator/components/com_j2store/views/product/tmpl/form_flexivariablevariants.php
+++ b/administrator/components/com_j2store/views/product/tmpl/form_flexivariablevariants.php
@@ -12,7 +12,7 @@
 <div id="variant_add_block">
     <input type="hidden" name="flexi_product_id" value="<?php echo $this->item->j2store_product_id;?>"/>
     <?php foreach ($this->item->product_options as $product_option): ?>
-        <select name="varient_combin[<?php echo $product_option->j2store_productoption_id;?>]">
+        <select name="variant_combin[<?php echo $product_option->j2store_productoption_id;?>]">
             <option value="0"><?php echo substr(JText::_('J2STORE_ANY').' '.$this->escape($product_option->option_name),0,10).'...';?></option>
             <?php foreach ($product_option->option_values as $option_value): ?>
                 <option value="<?php echo $option_value->j2store_optionvalue_id;?>"><?php echo $this->escape($option_value->optionvalue_name);?></option>
@@ -20,7 +20,7 @@
         </select>
     <?php endforeach; ?>
     <a onclick="addFlexiVariant()" class="btn btn-info"><?php echo JText::_('J2STORE_ADD_VARIANT');?></a>
-    <a onclick="remvoeFlexiAllVariant()" class="btn btn-danger"><?php echo JText::_('J2STORE_REMOVE_ALL_VARIANT');?></a>
+    <a onclick="removeFlexiAllVariant()" class="btn btn-danger"><?php echo JText::_('J2STORE_REMOVE_ALL_VARIANT');?></a>
 </div>
 <div id="variant_display_block">
     <!-- Advanced variable starts here  -->
@@ -140,7 +140,7 @@ function addFlexiVariant() {
         })(j2store.jQuery);
     }
 
-    function remvoeFlexiAllVariant() {
+    function removeFlexiAllVariant() {
         (function ($) {
             var delete_var_data = {
                 option: 'com_j2store',
diff --git a/administrator/components/com_j2store/views/product/tmpl/form_images.php b/administrator/components/com_j2store/views/product/tmpl/form_images.php
index a67b54e..1074486 100755
--- a/administrator/components/com_j2store/views/product/tmpl/form_images.php
+++ b/administrator/components/com_j2store/views/product/tmpl/form_images.php
@@ -60,10 +60,10 @@
                 </thead>
                 <tr>
                     <th>
-                        <?php echo J2Html::label(JText::_('J2STORE_PRODUCT_ADDITIONAL_IMAGE'), 'additioanl_image_label'); ?>
+                        <?php echo J2Html::label(JText::_('J2STORE_PRODUCT_ADDITIONAL_IMAGE'), 'additional_image_label'); ?>
                     </th>
                     <th>
-                        <?php echo J2Html::label(JText::_('J2STORE_PRODUCT_ADDITIONAL_IMAGE_ALT_TEXT'), 'additioanl_image_label'); ?>
+                        <?php echo J2Html::label(JText::_('J2STORE_PRODUCT_ADDITIONAL_IMAGE_ALT_TEXT'), 'additional_image_label'); ?>
                     </th>
                     <th>
                         <?php echo JText::_('J2STORE_DELETE'); ?>
@@ -171,7 +171,7 @@ function deleteImageRow(element) {
 
     function addAdditionalImage(image_div, counter, joomla_version) {
         (function ($) {
-            //increament the
+            //increment the
             var clone = image_div.clone();
             clone.attr('id', 'additional-image-' + counter);
             //need to change the input name
@@ -209,7 +209,7 @@ function addAdditionalImage(image_div, counter, joomla_version) {
             //get the newly added tbody and insert after the additional-image-0
             $(processed_html).insertAfter($('#additionalImages tbody:last-child'));
             $(processed_html).show();
-            // intialize squeeze box again for edit button to work
+            // initialize squeeze box again for edit button to work
             // no need in joomla 3.5
             if (joomla_version == 0) {
                 //window.parent.SqueezeBox.initialize({});
diff --git a/administrator/components/com_j2store/views/product/tmpl/productfiles.php b/administrator/components/com_j2store/views/product/tmpl/productfiles.php
index eced67e..f7033f3 100755
--- a/administrator/components/com_j2store/views/product/tmpl/productfiles.php
+++ b/administrator/components/com_j2store/views/product/tmpl/productfiles.php
@@ -84,7 +84,7 @@
 					</tr>
 				</thead>
 	<?php if(isset($this->productfiles) && !empty($this->productfiles)):?>
-	<tbody  class="tr_file_attachement">
+	<tbody  class="tr_file_attachment">
 		<?php 	foreach($this->productfiles as $counter => $singleFile):?>
 			<tr id="exist-file-tbody-<?php echo $singleFile->j2store_productfile_id;?>">
 
diff --git a/administrator/components/com_j2store/views/products/tmpl/couponproducts.php b/administrator/components/com_j2store/views/products/tmpl/couponproducts.php
index 2418123..7a2e2d2 100755
--- a/administrator/components/com_j2store/views/products/tmpl/couponproducts.php
+++ b/administrator/components/com_j2store/views/products/tmpl/couponproducts.php
@@ -119,7 +119,7 @@
 
 Joomla.submitform =function(){
 	var pressbutton =  jQuery("#task").val();
-	// depricated in joomla 3.4.x
+	// deprecated in joomla 3.4.x
 	 //submitform(pressbutton);
 	 jQuery('#productadminForm').submit();
 }
diff --git a/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping.php b/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping.php
index 8e78653..bf31234 100755
--- a/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping.php
+++ b/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping.php
@@ -33,7 +33,7 @@
             <h2>
                 <?php echo JText::_("J2STORE_SHIPPING_METHOD_VALIDATE"); ?>
             </h2>
-            <?php if ($this->shipping_avaliable): ?>
+            <?php if ($this->shipping_available): ?>
                 <div class="<?php echo $col_class ?>12">
                     <div class="tabbable tabs-left <?php echo $row_class ?>" >
                         <ul class="nav nav-tabs flex-column <?php echo $col_class ?>3" id="nav-tab" role="tablist">
diff --git a/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping_product.php b/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping_product.php
index feb44b3..dc58898 100755
--- a/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping_product.php
+++ b/administrator/components/com_j2store/views/shippingtroubles/tmpl/default_shipping_product.php
@@ -64,7 +64,7 @@
 			<!-- general Filters -->
 			<?php  //echo $this->loadTemplate('filters');?>
 		</div>
-		<?php if($this->shipping_avaliable):?>
+		<?php if($this->shipping_available):?>
 			<table class="table table-striped table-bordered">
 				<thead>
 					<tr>
diff --git a/components/com_j2store/controllers/checkouts.php b/components/com_j2store/controllers/checkouts.php
index 67a517b..ea5bc51 100755
--- a/components/com_j2store/controllers/checkouts.php
+++ b/components/com_j2store/controllers/checkouts.php
@@ -441,7 +441,7 @@ function guest() {
 			$app->redirect($link);
 		}
 
-		//set guest varibale to session as the array, if it does not exist
+		//set guest variable to session as the array, if it does not exist
 		if(!$session->has('guest', 'j2store')) {
 			$session->set('guest', array(), 'j2store');
 		}
@@ -545,7 +545,7 @@ function guest_validate() {
 			$json['redirect'] = $redirect_url;
 		}
 
-		// Check if guest checkout is avaliable.
+		// Check if guest checkout is available.
 		//TODO prevent if products have downloads also
 		if (!$params->get('allow_guest_checkout')) {
 			$json['redirect'] = $redirect_url;
@@ -752,7 +752,7 @@ function guest_shipping_validate() {
 			$json['redirect'] = $redirect_url;
 		}
 
-		// Check if guest checkout is avaliable.
+		// Check if guest checkout is available.
 		//TODO prevent if products have downloads also
 		if (!$params->get('allow_guest_checkout')) {
 			$json['redirect'] = $redirect_url;
@@ -1965,7 +1965,7 @@ function confirmPayment() {
 
 			// After confirm free product
 			J2Store::plugin()->event( "AfterConfirmFreeProduct", array ($order) );
-			
+
 			//free product. So clear cart.
 			if($clear_cart == 'order_confirmed') {
 				$order->empty_cart();
diff --git a/components/com_j2store/controllers/products.php b/components/com_j2store/controllers/products.php
index 561e7c9..d636418 100755
--- a/components/com_j2store/controllers/products.php
+++ b/components/com_j2store/controllers/products.php
@@ -484,7 +484,7 @@ public function getProductOptionList($product_type){
         return $db->loadObjectList();
     }
 	/**
-	 * Method to get Filters and to assing in the browse view
+	 * Method to get Filters and to assign in the browse view
 	 */
 	public function getFilters($items){
 
diff --git a/components/com_j2store/controllers/producttags.php b/components/com_j2store/controllers/producttags.php
index cb878bf..eb839e3 100755
--- a/components/com_j2store/controllers/producttags.php
+++ b/components/com_j2store/controllers/producttags.php
@@ -315,7 +315,7 @@ public function processProducts(&$items) {
 	}
 
 	/**
-	 * Method to get Filters and to assing in the browse view
+	 * Method to get Filters and to assign in the browse view
 	 */
 	public function getFilters($items){
 
diff --git a/components/com_j2store/views/carts/view.html.php b/components/com_j2store/views/carts/view.html.php
index 7437440..20d63a6 100755
--- a/components/com_j2store/views/carts/view.html.php
+++ b/components/com_j2store/views/carts/view.html.php
@@ -68,7 +68,7 @@ protected function onDisplay($tpl = null)
         $this->zone_id = $zone_id;
         $this->postcode = $postcode;
 
-        if($params->get('hide_shipping_untill_address_selection', 1) == 0) {
+        if($params->get('hide_shipping_until_address_selection', 1) == 0) {
             $session->set('billing_country_id', $country_id, 'j2store');
             $session->set('shipping_country_id', $country_id, 'j2store');
             $session->set('billing_zone_id', $zone_id, 'j2store');
diff --git a/components/com_j2store/views/checkout/tmpl/default_billing.php b/components/com_j2store/views/checkout/tmpl/default_billing.php
index c180409..00a12e8 100755
--- a/components/com_j2store/views/checkout/tmpl/default_billing.php
+++ b/components/com_j2store/views/checkout/tmpl/default_billing.php
@@ -75,7 +75,7 @@
             if($placeholder){
                 $field_options .= ' placeholder="'.$placeholder.'" ';
             }
-			$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br />',$html);
+			$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br />',$html);
 		}
 		?>
 	<?php endforeach; ?>
@@ -115,7 +115,7 @@
                         if($placeholder){
                             $field_options .= ' placeholder="'.$placeholder.'" ';
                         }
-						$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+						$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 						$uhtml .='<br />';
 					}
 					?>
diff --git a/components/com_j2store/views/checkout/tmpl/default_guest.php b/components/com_j2store/views/checkout/tmpl/default_guest.php
index cf603a9..8d40458 100755
--- a/components/com_j2store/views/checkout/tmpl/default_guest.php
+++ b/components/com_j2store/views/checkout/tmpl/default_guest.php
@@ -45,7 +45,7 @@
         if($placeholder){
             $field_options .= ' placeholder="'.$placeholder.'" ';
         }
-		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'<br />',$html);
+		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'<br />',$html);
 	}
 	?>
 <?php endforeach; ?>
@@ -99,7 +99,7 @@
                     if($placeholder){
                         $field_options .= ' placeholder="'.$placeholder.'" ';
                     }
-					$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+					$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 					$uhtml .='<br />';
 				}
 				?>
diff --git a/components/com_j2store/views/checkout/tmpl/default_guest_shipping.php b/components/com_j2store/views/checkout/tmpl/default_guest_shipping.php
index 49ad596..c351134 100755
--- a/components/com_j2store/views/checkout/tmpl/default_guest_shipping.php
+++ b/components/com_j2store/views/checkout/tmpl/default_guest_shipping.php
@@ -40,7 +40,7 @@
         if($placeholder){
             $field_options .= ' placeholder="'.$placeholder.'" ';
         }
-		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'<br />',$html);
+		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'<br />',$html);
 	}
 	?>
 <?php endforeach; ?>
@@ -79,7 +79,7 @@
                     if($placeholder){
                         $field_options .= ' placeholder="'.$placeholder.'" ';
                     }
-					$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+					$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 					$uhtml .='<br />';
 				}
 				?>
diff --git a/components/com_j2store/views/checkout/tmpl/default_register.php b/components/com_j2store/views/checkout/tmpl/default_register.php
index f842ff8..b864993 100755
--- a/components/com_j2store/views/checkout/tmpl/default_register.php
+++ b/components/com_j2store/views/checkout/tmpl/default_register.php
@@ -49,7 +49,7 @@
                             if($placeholder){
                                 $field_options .= ' placeholder="'.$placeholder.'" ';
                             }
-						 	$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br>',$html);
+						 	$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br>',$html);
 						}
 						?>
   <?php endforeach; ?>
@@ -141,7 +141,7 @@
                             if($placeholder){
                                 $field_options .= ' placeholder="'.$placeholder.'" ';
                             }
-						 	$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+						 	$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 						 	$uhtml .='<br />';
 						}
 						?>
diff --git a/components/com_j2store/views/checkout/tmpl/default_shipping.php b/components/com_j2store/views/checkout/tmpl/default_shipping.php
index 9affc7d..7474aac 100755
--- a/components/com_j2store/views/checkout/tmpl/default_shipping.php
+++ b/components/com_j2store/views/checkout/tmpl/default_shipping.php
@@ -69,7 +69,7 @@
                             if($placeholder){
                                 $field_options .= ' placeholder="'.$placeholder.'" ';
                             }
-						 	$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br>',$html);
+						 	$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null).'</br>',$html);
 						}
 						?>
   <?php endforeach; ?>
@@ -108,7 +108,7 @@
                             if($placeholder){
                                 $field_options .= ' placeholder="'.$placeholder.'" ';
                             }
-						 	$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+						 	$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 						 	$uhtml .='<br />';
 						}
 						?>
diff --git a/components/com_j2store/views/checkout/tmpl/default_shipping_payment.php b/components/com_j2store/views/checkout/tmpl/default_shipping_payment.php
index 3931c2b..5db9bc4 100755
--- a/components/com_j2store/views/checkout/tmpl/default_shipping_payment.php
+++ b/components/com_j2store/views/checkout/tmpl/default_shipping_payment.php
@@ -112,7 +112,7 @@ function j2storeGetPaymentForm(element, container) {
         if($placeholder){
             $field_options .= ' placeholder="'.$placeholder.'" ';
         }
-		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null),$html);
+		$html = str_replace('['.$fieldName.']',$this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null),$html);
 	}
 	?>
 <?php endforeach; ?>
@@ -153,7 +153,7 @@ function j2storeGetPaymentForm(element, container) {
                     if($placeholder){
                         $field_options .= ' placeholder="'.$placeholder.'" ';
                     }
-					$uhtml .= $this->fieldsClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+					$uhtml .= $this->fieldsClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 					$uhtml .='<br />';
 				}
 				?>
diff --git a/components/com_j2store/views/myprofile/tmpl/address.php b/components/com_j2store/views/myprofile/tmpl/address.php
index bb9a12e..404b2e4 100755
--- a/components/com_j2store/views/myprofile/tmpl/address.php
+++ b/components/com_j2store/views/myprofile/tmpl/address.php
@@ -83,7 +83,7 @@
                     if($placeholder){
                         $field_options .= ' placeholder="'.$placeholder.'" ';
                     }
-			 		$html = str_replace('['.$fieldName.']',$this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null),$html);
+			 		$html = str_replace('['.$fieldName.']',$this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null),$html);
 				}
 
 			?>
@@ -121,7 +121,7 @@
                                 if($placeholder){
                                     $field_options .= ' placeholder="'.$placeholder.'" ';
                                 }
-								$uhtml .= $this->fieldClass->getFormatedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
+								$uhtml .= $this->fieldClass->getFormattedDisplay($oneExtraField,$this->address->$fieldName, $fieldName,false, $field_options, $test = false, $allFields, $allValues = null);
 							}
 								 ?>
 						<?php endif;?>
diff --git a/components/com_j2store/views/myprofile/tmpl/default.php b/components/com_j2store/views/myprofile/tmpl/default.php
index badca77..e6ad0de 100755
--- a/components/com_j2store/views/myprofile/tmpl/default.php
+++ b/components/com_j2store/views/myprofile/tmpl/default.php
@@ -55,7 +55,7 @@
 		<h3><?php echo JText::_('J2STORE_MYPROFILE')?></h3>
         <?php if($messages_above_profile_html != ''){
             ?>
-            <div class="j2store-myprofile-addtional_messages">
+            <div class="j2store-myprofile-additional_messages">
                 <?php
                 echo $messages_above_profile_html;
                 ?>
diff --git a/components/com_j2store/views/myprofile/tmpl/view.php b/components/com_j2store/views/myprofile/tmpl/view.php
index e21b3ed..21a40e4 100755
--- a/components/com_j2store/views/myprofile/tmpl/view.php
+++ b/components/com_j2store/views/myprofile/tmpl/view.php
@@ -31,7 +31,7 @@
 <div class="j2store-order">
 	<div class="j2store-invoice-template">
 	<?php if(isset($this->order) && $this->error == false): ?>
-		<?php echo J2Store::invoice()->getFormatedInvoice($this->order,array()); ?>
+		<?php echo J2Store::invoice()->getFormattedInvoice($this->order,array()); ?>
 		
 	<?php else: ?>
 		<div class="alert alert-block alert-warning">
diff --git a/fof/autoloader/component.php b/fof/autoloader/component.php
index 64c30a9..7ab3151 100755
--- a/fof/autoloader/component.php
+++ b/fof/autoloader/component.php
@@ -95,7 +95,7 @@ public function isF0FComponent($component)
 	 * Creates class aliases. On systems where eval() is enabled it creates a
 	 * real class. On other systems it merely creates an alias. The eval()
 	 * method is preferred as class_aliases result in the name of the class
-	 * being instanciated not being available, making it impossible to create
+	 * being instantiated not being available, making it impossible to create
 	 * a class instance without passing a $config array :(
 	 *
 	 * @param   string   $original  The name of the original (existing) class
diff --git a/fof/model/model.php b/fof/model/model.php
index dcc71d6..701523e 100755
--- a/fof/model/model.php
+++ b/fof/model/model.php
@@ -2715,7 +2715,7 @@ protected function onAfterGetItem(&$record)
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 		}
 	}
@@ -2769,7 +2769,7 @@ protected function onBeforeSave(&$data, &$table)
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 
 			return false;
@@ -2810,7 +2810,7 @@ protected function onAfterSave(&$table)
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 
 			return false;
@@ -2860,7 +2860,7 @@ protected function onBeforeDelete(&$id, &$table)
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 
 			return false;
@@ -2898,7 +2898,7 @@ protected function onAfterDelete($id)
 		}
 		catch (Exception $e)
 		{
-			// Oops, an exception occured!
+			// Oops, an exception occurred!
 			$this->setError($e->getMessage());
 
 			return false;
diff --git a/language/backend/en-GB/en-GB.com_j2store.ini b/language/backend/en-GB/en-GB.com_j2store.ini
index eb6cf58..fde9f87 100755
--- a/language/backend/en-GB/en-GB.com_j2store.ini
+++ b/language/backend/en-GB/en-GB.com_j2store.ini
@@ -148,7 +148,7 @@ COM_J2STORE_MAINMENU_REPORTING="Reporting"
 J2STORE_UPDATE_TO_VERSION="Update to"
 J2STORE_USER_GUIDE="User guide"
 J2STORE_USER_GUIDE_INTRODUCTION="Need some help ? Our user guide is a great resource that will help you set up your shop correctly. Before asking a question on the forums, this should be your first check point"
-J2STORE_USER_GUIDE_READ="Read it now" 
+J2STORE_USER_GUIDE_READ="Read it now"
 COM_J2STORE_TITLE_CONFIGURATION="Configuration"
 
 ;product
@@ -219,7 +219,7 @@ J2STORE_PRODUCT_SET_PRICES="Set prices"
 J2STORE_PRODUCT_PRICING_CALCULATOR="Pricing Calculator"
 COM_J2STORE_PRODUCT_PRICING_CALCULATOR_STANDARD="Standard"
 J2STORE_PRODUCT_SET_PRICES="Set Prices"
-J2STORE_PRODUCT_ADD_PRICING="Add Pricing" 	
+J2STORE_PRODUCT_ADD_PRICING="Add Pricing"
 J2STORE_PRODUCT_PRICE_DATE_RANGE="Date Range (Optional)"
 J2STORE_PRODUCT_PRICE_QUANTITY_RANGE="Quantity Range (Optional)"
 J2STORE_PRODUCT_PRICE_GROUP_RANGE="Customer Group"
@@ -306,7 +306,7 @@ J2STORE_PRODUCT_FILE_DISPLAY_NAME="Display name"
 J2STORE_PRODUCT_FILE_PATH="File path"
 J2STORE_CHOOSE_FILE="Choose file"
 
-;product types 
+;product types
 J2STORE_PRODUCT_TYPE_SIMPLE="Simple"
 J2STORE_PRODUCT_TYPE_VARIABLE="Variable"
 J2STORE_PRODUCT_TYPE_CONFIGURABLE="Configurable"
@@ -521,9 +521,9 @@ J2STORE_TAXRULE_DELETED_SUCCESSFULLY="Tax rule deleted successfully"
 COM_J2STORE_TITLE_LENGTHS="Lengths"
 COM_J2STORE_TITLE_LENGTHS_EDIT="Add / edit length"
 J2STORE_LENGTH_TITLE_LABEL="Length title"
-J2STORE_LENGTH_TITLE_DESC="Enter a title for this length class. Example: Centimeter"   
+J2STORE_LENGTH_TITLE_DESC="Enter a title for this length class. Example: Centimeter"
 J2STORE_LENGTH_UNIT_LABEL="Length unit"
-J2STORE_LENGTH_UNIT_DESC="Unit of the length class. Example: cm for Centimeter"   
+J2STORE_LENGTH_UNIT_DESC="Unit of the length class. Example: cm for Centimeter"
 J2STORE_LENGTH_VALUE_LABEL="Length value"
 J2STORE_LENGTH_VALUE_DESC="Set 1 for the default value. Every value added to other lengths, such as km, will need to be relative to that. There are 10 mm in one 1cm, so the value of mm would be set to 10."
 
@@ -531,11 +531,11 @@ J2STORE_LENGTH_VALUE_DESC="Set 1 for the default value. Every value added to oth
 COM_J2STORE_TITLE_WEIGHTS="Weights"
 COM_J2STORE_TITLE_WEIGHTS_EDIT="Add / edit weight"
 J2STORE_WEIGHT_TITLE_LABEL="Weight title"
-J2STORE_WEIGHT_TITLE_DESC="The name of the weight measurement (i.e. Kilogram)"   
+J2STORE_WEIGHT_TITLE_DESC="The name of the weight measurement (i.e. Kilogram)"
 J2STORE_WEIGHT_UNIT_LABEL="Weight unit"
-J2STORE_WEIGHT_UNIT_DESC="The units of measurement (i.e. kg)"   
+J2STORE_WEIGHT_UNIT_DESC="The units of measurement (i.e. kg)"
 J2STORE_WEIGHT_VALUE_LABEL="Weight value"
-J2STORE_WEIGHT_VALUE_DESC="Set 1 for the default value. Every value added to other weights, such as g, will need to be relative to that value. There are 1000 g in 1 kg, so the value of g would be set to 1000."   
+J2STORE_WEIGHT_VALUE_DESC="Set 1 for the default value. Every value added to other weights, such as g, will need to be relative to that value. There are 1000 g in 1 kg, so the value of g would be set to 1000."
 
 
 ;emailtemplates
@@ -735,7 +735,7 @@ J2STORE_SFR_TAX_CLASS_NAME="Tax Class Name"
 J2STORE_SFR_GEOZONE_NAME="Geozone Name"
 J2STORE_SHIPM_STATE="Enabled"
 J2STORE_SHIPM_SET_RATES="Set rates"
-J2STORE_SHIPPING_METHODS_MINIMUM_SUBTOTAL_REQUIRED="Minimum Subtotal required" 
+J2STORE_SHIPPING_METHODS_MINIMUM_SUBTOTAL_REQUIRED="Minimum Subtotal required"
 J2STORE_SHIPPING_METHODS_SUBTOTAL_MAX="Maximum subtotal required"
 J2STORE_SHIPM_FLAT_RATE_PER_ITEM="Flat rate per item"
 J2STORE_SHIPM_WEIGHT_BASED_PER_ITEM="Weight based per item"
@@ -819,14 +819,14 @@ J2STORE_CONF_LOAD_JQUERY_DESC="If your template or other extensions load jquery,
 J2STORE_CONF_LOAD_JQUERYUI_LABEL="Load jQuery UI?"
 J2STORE_CONF_LOAD_JQUERYUI_DESC="If your template or other extensions load jquery UI, you can choose Do Not Load option. Otherwise you can load either the local copy of jquery UI or remote (Google)."
 J2STORE_CONF_LOAD_BOOTSTRAP_LABEL="Load full bootstrap css"
-J2STORE_CONF_LOAD_BOOTSTRAP_DESC="If your template comes with Boostrap loaded, you may wish to set this to NO. Set this to Yes to load the Boostrap CSS packed with J2Store."
+J2STORE_CONF_LOAD_BOOTSTRAP_DESC="If your template comes with Bootstrap loaded, you may wish to set this to NO. Set this to Yes to load the Bootstrap CSS packed with J2Store."
 J2STORE_CONF_ISREGISTER_LABEL="Who can see the add to cart?"
 J2STORE_EVERYONE="Everyone"
 J2STORE_ONLY_REGISTERED_USERS="Only registered users"
 J2STORE_CONF_ATTACHMENTFOLDERPATH_LABEL="Folder path for digital goods"
 J2STORE_CONF_ATTACHMENTFOLDERPATH_DESC="The relative path to the folder with your files (example: media/myfiles)"
 J2STORE_CONF_DATE_FORMAT_LABEL="Date Format"
-J2STORE_CONF_DATE_FORMAT_DESC="Used for formating date. Refer the PHP manual to learn the available date formats"
+J2STORE_CONF_DATE_FORMAT_DESC="Used for formatting date. Refer the PHP manual to learn the available date formats"
 
 ;store profile
 COM_J2STORE_TITLE_STOREPROFILES="Store profiles"
@@ -950,7 +950,7 @@ J2STORE_CONF_HIDE_OUTOFSTOCK_PRODUCTS_DESC="Setting this YES, will hide the cart
 J2STORE_CONF_STOCK_DISPLAY_FORMAT_LABEL="Stock display format"
 J2STORE_CONF_STOCK_DISPLAY_FORMAT_DESC="Choose the stock display format"
 J2STORE_STOCK_SELECTED_DISPLAY="Always show stock. E.g. 12 In Stock"
-J2STORE_STOCK_SHOW_LOW_STOCK="Show only when stock reaches the low stock threshhold. E.g. Only 2 left in stock"
+J2STORE_STOCK_SHOW_LOW_STOCK="Show only when stock reaches the low stock threshold. E.g. Only 2 left in stock"
 J2STORE_STOCK_DO_NOT_DISPLAY="Never show stock"
 
 ;order settings
@@ -984,7 +984,7 @@ J2STORE_ORDER_TOKEN="Token"
 
 ;others
 J2STORE_MISC_SETTINGS="Others"
-J2STORE_CONF_SHOW_TERMS_LABEL="Show terms and conditions during checkout?" 
+J2STORE_CONF_SHOW_TERMS_LABEL="Show terms and conditions during checkout?"
 J2STORE_CONF_SHOW_TERMS_DESC="Setting this will show a check box with a link to the Article that has terms and conditions. Enter the Article ID in the following input box"
 J2STORE_CONF_TERMS_DISPLAY_TYPE_LABEL="Terms and conditions display type"
 J2STORE_CONF_TERMS_DISPLAY_TYPE_DESC="By default, a link will be displayed during the checkout process. If you want your customers to tick a checkbox, choose checkbox"
@@ -1060,7 +1060,7 @@ J2STORE_CART_CALCULATE_TAX_SHIPPING="Estimate"
 J2STORE_CHECKOUT_SELECT_A_SHIPPING_METHOD="Select a shipping method"
 J2STORE_ORDER_SHIPPING_TAX="Tax on shipping"
 J2STORE_CART_CONTINUE_SHOPPING="Continue Shopping"
-J2STORE_CART_DELETE_ERROR="An error occured while deleting a cart item"
+J2STORE_CART_DELETE_ERROR="An error occurred while deleting a cart item"
 J2STORE_CART_QUANTITY_ADJUSTED="Cart item quantity has been adjusted due to availability restrictions"
 J2STORE_CART_ITEM_STOCK_NOT_ENOUGH_STOCK="Sorry, we do not have enough <strong>%s</strong> in stock to fulfill your order (Only %s in stock). Please edit your cart and try again. We apologise for any inconvenience caused."
 J2STORE_CART_ITEM_STOCK_NOT_AVAILABLE="Sorry, "%s" is not in stock. Please edit your cart and try again. We apologise for any inconvenience caused."
@@ -1078,7 +1078,7 @@ J2STORE_CART_DISCOUNT="Discount"
 
 ;cart file upload
 J2STORE_UPLOAD_ERR_MEDIAHELPER_ERROR="Media handling error:"
-J2STORE_UPLOAD_ERR_GENERIC_ERROR="An error occured while uploading the file"
+J2STORE_UPLOAD_ERR_GENERIC_ERROR="An error occurred while uploading the file"
 J2STORE_UPLOAD_ERROR_FOLDER_PERMISSION_ERROR="Upload folder is not writable. Check folder permissions"
 J2STORE_UPLOAD_ERR_NAMECLASH="Another file exists in the same name. Rename the file and upload again"
 J2STORE_UPLOAD_ERR_CANTJFILEUPLOAD="File could not be uploaded"
@@ -1121,7 +1121,7 @@ J2STORE_CHECKOUT_ERROR_LOGIN="Username/password invalid"
 J2STORE_ADDRESS_SELECTION_ERROR="Select an address or create a new one"
 J2STORE_CHECKOUT_ERROR_PAYMENT_METHOD="Choose a payment method"
 J2STORE_CHECKOUT_ERROR_AGREE_TERMS="Agree to terms and conditions"
-J2STORE_CHECKOUT_SELECT_A_SHIPPING_METHOD="Select a shipping method" 
+J2STORE_CHECKOUT_SELECT_A_SHIPPING_METHOD="Select a shipping method"
 J2STORE_PLEASE_SELECT_YOUR_PREFERRED_SHIPPING_METHOD_BELOW="Please select your preferred method of shipping below"
 J2STORE_GET_SHIPPING_RATES="Get shipping rates"
 J2STORE_FORGOT_YOUR_PASSWORD="Forgot your password"
@@ -1214,11 +1214,11 @@ J2STORE_SHIPPIED="Shipped"
 J2STORE_FAILED="Failed"
 J2STORE_CANCELLED="Cancelled"
 
-;order histry
+;order history
 J2STORE_NEW_ORDER_CREATED="Order created"
 J2STORE_ORDER_UPDATED="Order updated"
 J2STORE_CUSTOMER_NOTIFIED="Customer notified"
-J2STORE_ORDERITEM_STOCK_REDUCED="Item %s stock has been reduced from %s to %s" 
+J2STORE_ORDERITEM_STOCK_REDUCED="Item %s stock has been reduced from %s to %s"
 J2STORE_ORDER_STATUS_CHANGED="Order status changed from %s to %s"
 
 ;customers
@@ -1310,7 +1310,7 @@ J2STORE_BANK_CODE="Bank Code"
 J2STORE_PAYMENT_PROCESSING_PLEASE_WAIT="Processing payment...please wait"
 J2STORE_PAYMENT_ERROR_PROCESSING="Error processing payment"
 J2STORE_PAYMENT_COMPLETED_PROCESSING="Completed processing payment"
-J2STORE_PAYMENT_ON_ERROR_INSTRUCTIONS="An error occured while processing the payment. Please contact us"
+J2STORE_PAYMENT_ON_ERROR_INSTRUCTIONS="An error occurred while processing the payment. Please contact us"
 
 ;payment plugins
 
@@ -1336,7 +1336,7 @@ J2STORE_BUTTON_TEXT_DESC="Name of the payment button. Default is: Place order. Y
 
 ;report plugins
 J2STORE_REPORT="Report"
-PLG_J2STORE_REPORT_ITEMISED_EXPORT_HELP="You can export the columns seen here to a comma seperated file" 
+PLG_J2STORE_REPORT_ITEMISED_EXPORT_HELP="You can export the columns seen here to a comma separated file"
 PLG_J2STORE_REPORT_ITEMISED="Itemised Purchase Report"
 J2STORE_REPORTS_ITEMISED_PURCHASES="Total Purchases"
 
@@ -1421,7 +1421,7 @@ J2STORE_DIAGNOSTICS_HELP_TEXT="This tool will help you diagnose some of the comm
 
 ;localisation app
 PLG_J2STORE_APP_LOCALIZATION_DATA="Localisation data for J2Store"
-J2STORE_APP_LOCALIZATION_DATA_HELP_TEXT="Use this app to populate the localisation data like countries, zones and metrics. Installing the data will replace the exisiting countries, zones data."
+J2STORE_APP_LOCALIZATION_DATA_HELP_TEXT="Use this app to populate the localisation data like countries, zones and metrics. Installing the data will replace the existing countries, zones data."
 
 ;shipping
 J2STORE_CREATE_EDIT_LINK="Create / Edit / Link"
@@ -1523,7 +1523,7 @@ J2STORE_ACCOUNT_DETAILS="Account details for %s at %s"
 J2STORE_SEND_MSG="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the following details:\n\nUsername: %s\n\nPassword: %s\n\nPlease do not respond to this message. It is automatically generated and is for information purposes only."
 J2STORE_SEND_MSG_NOPW="Hello %s,\n\nThank you for registering at %s.\n\nYou may now log in to %s using the following details:\n\nUsername: %s\n\nPlease do not respond to this message. It is automatically generated and is for information purposes only."
 
-J2STORE_SEND_MSG_ACTIVATE="Hello %s,\n\nThank you for registering at %s.\n\nPlease activate your account by clicking the url %s before loging in using the following details:\n\nUsername: %s\n\nPassword: %s\n\nPlease do not respond to this message. It is automatically generated and is for information purposes only."
+J2STORE_SEND_MSG_ACTIVATE="Hello %s,\n\nThank you for registering at %s.\n\nPlease activate your account by clicking the url %s before logging in using the following details:\n\nUsername: %s\n\nPassword: %s\n\nPlease do not respond to this message. It is automatically generated and is for information purposes only."
 
 
 ;missing strings
@@ -1556,7 +1556,7 @@ COM_J2STORE_LBL_EMAILTEMPLATES_SAVED="Emailtemplate saved"
 COM_J2STORE_LBL_INVOICETEMPLATES_SAVED="Invoicetemplate saved"
 J2STORE_BILLING="Billing"
 J2STORE_SHIPPING="Shipping"
-J2STORE_ADDITIOANL="Additional"
+J2STORE_ADDITIONAL="Additional"
 COM_J2STORE_LBL_CUSTOMFIELDS_SAVED="Customfields saved"
 J2STORE_SAVE_ALL_CHANGES="Save all changes"
 J2STORE_PRODUCTS_LIST_VIEW_HELP_TEXT="J2Store uses Joomla articles as products. To create a product, click the New button or just go to the Article Manager. <br /> The concept here is not to re-invent the wheel and add unnecessary overheads. <br /> J2Store is lightweight and focuses on the ecommerce parts. Joomla already comes with quite a lot of features. So articles can be very well used for managing the catalog. <br /> We will soon be providing integration for other Content construction kits and you can use them as products as well"
@@ -1567,7 +1567,7 @@ J2STORE_PRODUCT_FILE_SAVED_SUCCESSFULLY="Product file saved"
 J2STORE_PRODUCT_FILE_DELETED_SUCCESSFULLY="Product file deleted"
 
 ;added in 3.1.1
-J2STORE_NO_VARIANT_FOUND="Variant ID is missing in the request" 
+J2STORE_NO_VARIANT_FOUND="Variant ID is missing in the request"
 J2STORE_PRODUCT_LIST_FILTER="Sidebar filters"
 J2STORE_PRODUCT_SHOW_SPECIFICATION="Show Specification"
 J2STORE_PLUGIN_SHORTCODE_ADDITIONAL="Additional short codes"
@@ -1610,7 +1610,7 @@ J2STORE_PRODUCT_ADDED_ALREADY="Product already exists"
 
 ;added in 3.1.2
 J2STORE_CONF_PRODUCT_COMPARE_LABEL="Enable product compare"
-J2STORE_CONF_PRODUCT_COMPARE_DESC="This will enable the product comparision feature"
+J2STORE_CONF_PRODUCT_COMPARE_DESC="This will enable the product comparison feature"
 J2STORE_VENDOR_DETAIL="Vendor Details"
 J2STORE_VENDOR_TAB_PROFILE="Profile"
 J2STORE_ADDRESS_VENDOR_NAME="Vendor name"
@@ -1658,8 +1658,8 @@ J2STORE_WATCH="Watch"
 
 ;added in 3.1.5
 J2STORE_VOUCHER_SEND="Send voucher"
-J2STORE_VOUCHERS_SENDING_FAILED_TO_RECEIPIENT="Sending voucher to the following receipient failed: %s"
-J2STORE_VOUCHERS_SENDING_FAILED="Sending vouchers to one or more receipient failed"
+J2STORE_VOUCHERS_SENDING_FAILED_TO_RECIPIENT="Sending voucher to the following recipient failed: %s"
+J2STORE_VOUCHERS_SENDING_FAILED="Sending vouchers to one or more recipient failed"
 J2STORE_VOUCHERS_SENDING_SUCCESSFUL="Vouchers sent successfully"
 J2STORE_CONF_DEFAULT_PAYMENT_METHOD_LABEL="Default payment method"
 J2STORE_CONF_DEFAULT_PAYMENT_METHOD_DESC="Choose your default payment method. This will be selected by default when customers checkout"
@@ -1675,7 +1675,7 @@ J2STORE_EMAILTEMPLATE_SEND_TEST_EMAIL_TO_YOURSELF="Send a test email to yourself
 J2STORE_EMAILTEMPLATE_TEST_EMAIL_SENT="Test email has been sent to %s"
 J2STORE_EMAILTEMPLATE_NOT_FOUND="Email template not found"
 J2STORE_EMAILTEMPLATE_NO_ORDERS_FOUND="No orders found. Please make one test purchase so that we can test the email using the order record."
-J2STORE_EMAILTEMPLATE_TEST_EMAIL_ERROR="An error occured while sending the test email."
+J2STORE_EMAILTEMPLATE_TEST_EMAIL_ERROR="An error occurred while sending the test email."
 J2STORE_VOUCHER_TITLE="Voucher (%s)"
 
 ;added in 3.1.6
@@ -1705,7 +1705,7 @@ J2STORE_PRODUCT_LIST_SHOW_FILTER_CATEGORY_ALL="Show label: All"
 J2STORE_PLUGIN_SURCHARGE_TAX="Tax on surcharge"
 J2STORE_PLUGIN_SURCHARGE_TAX_DESC="If you need to collect tax on the surcharge, you can choose a tax profile here. Otherwise leave it as not taxable"
 
-;added in 3.1.8 
+;added in 3.1.8
 J2STORE_NOTIFY_QUANTITY="Low stock notify quantity"
 J2STORE_PRODUCT_LINK_IMAGE_TO_PRODUCT="Link image to product"
 J2STORE_PRODUCT_ENABLE_QUICKVIEW_LABEL="Enable Quickview"
@@ -1717,7 +1717,7 @@ J2STORE_PRODUCT_SHOW_BACK_TO_LABEL="Show link to product list"
 J2STORE_PRODUCT_BACK_TO="Back to "
 J2STORE_CONF_MAKE_POSTALCODE_REQUIRED_LABEL="Make postal code required in the shipping/tax estimator"
 J2STORE_CONF_MAKE_POSTALCODE_REQUIRED_DESC="This will make the entry of postal code mandatory while estimating shipping and tax in the cart page"
-J2STORE_ESTIMATE_COUNTRY_REQUIRED="Choose a country" 
+J2STORE_ESTIMATE_COUNTRY_REQUIRED="Choose a country"
 J2STORE_ESTIMATE_ZONE_REQUIRED="Choose a state/region"
 J2STORE_ESTIMATE_POSTALCODE_REQUIRED="Please enter a valid postal / zip code"
 J2STORE_CART_FOR_DETAIL_CART_LAYOUT_ONLY="For detail cart layout only"
@@ -1783,7 +1783,7 @@ J2STORE_COUPON_MAXIMUM_ITEM_LIMIT="Limit usage to x quantity of a product"
 J2STORE_COUPON_MAXIMUM_ITEM_LIMIT_DESC="Limit the coupon to certain quantity of a product. Example: If you set this to 2, then discount will be applied up to 2 quantity of the item. <strong>Applies only if you have this coupon configured for selected products.</strong> Leave blank for all items"
 J2STORE_COUPON_MAXIMUM_ITEM_LIMIT_PLACEHOLDER="Apply to all qualifying items in cart"
 J2STORE_COUPON_MAXIMUM_QUANTITY="Limit usage to x cart quantity"
-J2STORE_COUPON_MAXIMUM_QUANTITY_HELP_TEXT="Coupon will be applied only when the total quantity of the cart is less than the number specificed here. Leave it as empty or zero to disable this limitation"
+J2STORE_COUPON_MAXIMUM_QUANTITY_HELP_TEXT="Coupon will be applied only when the total quantity of the cart is less than the number specified here. Leave it as empty or zero to disable this limitation"
 SHIPPING_FREE="Free shipping"
 PLG_J2STORE_SHIPPING_FREE_DESCRIPTION="The plugin allows customer to checkout with free shipping. You can restrict the availability of this method to selected geozones"
 J2STORE_GEOZONE_LABEL_DESCRIPTION="The Free shipping will be applied to the selected geozones."
@@ -1824,18 +1824,18 @@ PLG_FINDER_J2STORE="Smart Search - J2Store"
 PLG_FINDER_J2STORE_DESCRIPTION="This plugin indexes J2Store products."
 PLG_FINDER_QUERY_FILTER_BRANCH_S_J2STORE_CATEGORY="J2Store Category"
 PLG_FINDER_QUERY_FILTER_BRANCH_S_J2STORE_BRAND="J2Store Brands"
-PLG_FINDER_J2STORE_REDIRECT_TO_LABEL="Product link to" 
+PLG_FINDER_J2STORE_REDIRECT_TO_LABEL="Product link to"
 PLG_FINDER_J2STORE_ARTICLE_VIEW="Article view"
 PLG_FINDER_J2STORE_VIEW="J2Store view"
 PLG_FINDER_J2STORE_SELECT_MENU_ITEM_LABEL="Choose Menu"
- 
+
 ;search
 PLG_SEARCH_J2STORE="Search - J2Store"
 PLG_SEARCH_J2STORE_DESCRIPTION="This plugin extends the default Joomla! search functionality to J2Store product."
-PLG_SEARCH_J2STORE_REDIRECT_TO_LABEL="Product link to" 
+PLG_SEARCH_J2STORE_REDIRECT_TO_LABEL="Product link to"
 PLG_SEARCH_J2STORE_ARTICLE_VIEW="Article view"
 PLG_SEARCH_J2STORE_VIEW="J2Store view"
-PLG_SEARCH_J2STORE_SELECT_MENU_ITEM_LABEL="Choose Menu" 
+PLG_SEARCH_J2STORE_SELECT_MENU_ITEM_LABEL="Choose Menu"
 PLG_SEARCH_CONTENT_FIELD_SEARCHLIMIT_LABEL="Search limit"
 
 J2STORE_PRODUCT_LIST_FILTER_MANUFACTURER_FILTER_LIST="Manufacturer filter listing type"
@@ -1854,8 +1854,8 @@ J2STORE_CONF_SHOW_SHOW_MANUFACTURER_LABEL="Manufacturer / Brand"
 J2STORE_CONF_SHOW_SHOW_MANUFACTURER_DESC="Show manufacturer / brand"
 ;filtergroups
 J2STORE_PRODUCT_FILTER_VALUE_DELETE_ERROR="Warning!  Error in deleting Filter value,the filter value you are trying to delete is associated with product(s), so delete the filter value from the respective product(s) and continue"
-J2STORE_FILTER_GROUP_DELETE_ERROR="Warning! Error in deleting Filter(s),the filter you are trying to delete is associated with product(s), so delete the fiters from the respective product(s) and continue"
-J2STORE_PRODUCT_FILTER_VALUE_DELETE_SUCCESS="Fitler value deleted"
+J2STORE_FILTER_GROUP_DELETE_ERROR="Warning! Error in deleting Filter(s),the filter you are trying to delete is associated with product(s), so delete the filters from the respective product(s) and continue"
+J2STORE_PRODUCT_FILTER_VALUE_DELETE_SUCCESS="Filter value deleted"
 J2STORE_OPTION_ORDERING="Ordering"
 
 ;backend order
@@ -1927,7 +1927,7 @@ J2STORE_SHIPPING_TROUBLESHOOT_NOTE_MESSAGE="Please enable atleast one Shipping p
 J2STORE_PRODUCT_SHIPPING_ENABLED="Shipping Enabled"
 J2STORE_PRODUCT_SHIPPING_DIMENSION="Dimensions"
 J2STORE_PRODUCT_SHIPPING_WEIGHT="Weights"
-J2STORE_PRODUCT_SHIPPING_CLASS="Dimention Unit"
+J2STORE_PRODUCT_SHIPPING_CLASS="Dimension Unit"
 J2STORE_SHIPPING_START_WIZARD="Start"
 J2STORE_SHIPPING_METHOD_VALIDATE="1. Shipping Plugin Setup"
 J2STORE_SHIPPING_PRODUCT_VALIDATE="2. Product Settings"
@@ -2101,7 +2101,7 @@ J2STORE_STORE_QUEUE_REPEAT_COUNT="Maximum Queue repeat"
 J2STORE_STORE_QUEUE_REPEAT_COUNT_DESC="Set maximum queue repeat for Queue system"
 
 J2STORE_RESEND_MAIL="Resend Email"
-J2STORE_TAB_NOT_DISPLY_IN_CONTENT="Please enable <b>Show Article Options</b> for display <b>J2Store cart</b> tab. Goto Article -> click Options -> click Editing Layout, here set  <b>Show Article Options</b> to <b>Show</b>"
+J2STORE_TAB_NOT_DISPLAY_IN_CONTENT="Please enable <b>Show Article Options</b> for display <b>J2Store cart</b> tab. Goto Article -> click Options -> click Editing Layout, here set  <b>Show Article Options</b> to <b>Show</b>"
 
 J2STORE_STANDARDS_BASED_ON_SUBTOTAL_OR_TOTAL="The order total for shipping calculation should be?"
 J2STORE_STANDARD_SHIPPING_BEFORE_DISCOUNT="Before discount"
@@ -2110,7 +2110,7 @@ J2STORE_PRODUCT_UPSELL_IMAGE_WIDTH="Upsell image width"
 J2STORE_PRODUCT_CROSS_IMAGE_WIDTH="Cross sell image width"
 PLG_USER_J2CUSTOM_PROFILE_FIELDS="User Details"
 PLG_USER_J2CUSTOM_PROFILE_J2STORE_FIELDS="Address"
-J2STORE_J2USERREGISTER_FILEDS_HTML="Fields Html"
+J2STORE_J2USERREGISTER_FIELDS_HTML="Fields Html"
 J2STORE_OPTION_VALUE_USED_IN_SOME_PRODUCT="The option value(s) you are trying to delete are still associated with some of the products. They should be removed from those products before you could delete here."
 J2STORE_J2USERREGISTER_SHOW_MYPROFILE="J2Store’s MyProfile view"
 J2STORE_INVENTRY_FILTER_STOCK="Inventry Status"
@@ -2137,9 +2137,9 @@ J2STORE_MONEYORDER_INSTRUCTIONS="Money order instructions"
 J2STORE_DOWNLOAD_ID_PASTE="Paste your Download ID and press the button"
 J2STORE_APPLY_DOWNLOAD_BUTTON="Apply Download ID"
 J2STORE_CART_MODULE_TITLE="Cart module title"
-J2STORE_INVAILD_DOWNLOAD_ID="The Download ID is either invalid or your PRO license has expired. Please check the My Downloads section in https://www.j2store.org/my-downloads.html"
+J2STORE_INVALID_DOWNLOAD_ID="The Download ID is either invalid or your PRO license has expired. Please check the My Downloads section in https://www.j2store.org/my-downloads.html"
 J2STORE_APPLYING_DLID_PLEASE_WAIT="Applying Download ID... Please wait..."
-J2STORE_VAILD_DOWNLOAD_ID="Download ID applied successfully"
+J2STORE_VALID_DOWNLOAD_ID="Download ID applied successfully"
 J2STORE_PRODUCT_MAIN_TAG="Main Tag"
 COM_J2STORE_VIEW_PRODUCT_TAGS_LABEL="Products Tag View"
 J2STORE_PRODUCT_INVALID_QUANTITY="Please enter a valid quantity"
diff --git a/media/j2store/js/filter.js b/media/j2store/js/filter.js
index 7e21ce5..2c9df2b 100755
--- a/media/j2store/js/filter.js
+++ b/media/j2store/js/filter.js
@@ -148,7 +148,7 @@ jQuery(function($) {
 		init : function(options) {		 
 			
 			/**  
-			 * let us assing default value for the var . 
+			 * let us assign default value for the var . 
 			 * incase  the option is empty
 			 */  
 			if(options.form_id ==''){				
diff --git a/media/j2store/js/jquery.validate.min.js b/media/j2store/js/jquery.validate.min.js
index 85afad5..95880da 100755
--- a/media/j2store/js/jquery.validate.min.js
+++ b/media/j2store/js/jquery.validate.min.js
@@ -1,4 +1,4 @@
 /*! jQuery Validation Plugin - v1.10.0 - 9/7/2012
 * https://github.com/jzaefferer/jquery-validation
 * Copyright (c) 2012 Jörn Zaefferer; Licensed MIT, GPL */
-(function(a){a.extend(a.fn,{validate:function(b){if(!this.length){b&&b.debug&&window.console&&console.warn("nothing selected, can't validate, returning nothing");return}var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.validateDelegate(":submit","click",function(b){c.settings.submitHandler&&(c.submitButton=b.target),a(b.target).hasClass("cancel")&&(c.cancelSubmit=!0)}),this.submit(function(b){function d(){var d;return c.settings.submitHandler?(c.submitButton&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(c.submitButton.value).appendTo(c.currentForm)),c.settings.submitHandler.call(c,c.currentForm,b),c.submitButton&&d.remove(),!1):!0}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){if(a(this[0]).is("form"))return this.validate().form();var b=!0,c=a(this[0].form).validate();return this.each(function(){b&=c.element(this)}),b},removeAttrs:function(b){var c={},d=this;return a.each(b.split(/\s/),function(a,b){c[b]=d.attr(b),d.removeAttr(b)}),c},rules:function(b,c){var d=this[0];if(b){var e=a.data(d.form,"validator").settings,f=e.rules,g=a.validator.staticRules(d);switch(b){case"add":a.extend(g,a.validator.normalizeRule(c)),f[d.name]=g,c.messages&&(e.messages[d.name]=a.extend(e.messages[d.name],c.messages));break;case"remove":if(!c)return delete f[d.name],g;var h={};return a.each(c.split(/\s/),function(a,b){h[b]=g[b],delete g[b]}),h}}var i=a.validator.normalizeRules(a.extend({},a.validator.metadataRules(d),a.validator.classRules(d),a.validator.attributeRules(d),a.validator.staticRules(d)),d);if(i.required){var j=i.required;delete i.required,i=a.extend({required:j},i)}return i}}),a.extend(a.expr[":"],{blank:function(b){return!a.trim(""+b.value)},filled:function(b){return!!a.trim(""+b.value)},unchecked:function(a){return!a.checked}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return arguments.length===1?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),c)}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",validClass:"valid",errorElement:"label",focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a,b){this.lastActive=a,this.settings.focusCleanup&&!this.blockFocusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.addWrapper(this.errorsFor(a)).hide())},onfocusout:function(a,b){!this.checkable(a)&&(a.name in this.submitted||!this.optional(a))&&this.element(a)},onkeyup:function(a,b){if(b.which===9&&this.elementValue(a)==="")return;(a.name in this.submitted||a===this.lastActive)&&this.element(a)},onclick:function(a,b){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",creditcard:"Please enter a valid credit card number.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}.")},autoCreateRanges:!1,prototype:{init:function(){function d(b){var c=a.data(this[0].form,"validator"),d="on"+b.type.replace(/^validate/,"");c.settings[d]&&c.settings[d].call(c,this[0],b)}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var b=this.groups={};a.each(this.settings.groups,function(c,d){a.each(d.split(/\s/),function(a,d){b[d]=c})});var c=this.settings.rules;a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).validateDelegate(":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'] ,[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'] ","focusin focusout keyup",d).validateDelegate("[type='radio'], [type='checkbox'], select, option","click",d),this.settings.invalidHandler&&a(this.currentForm).bind("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){b=this.validationTargetFor(this.clean(b)),this.lastElement=b,this.prepareElement(b),this.currentElements=a(b);var c=this.check(b)!==!1;return c?delete this.invalid[b.name]:this.invalid[b.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),c},showErrors:function(b){if(b){a.extend(this.errorMap,b),this.errorList=[];for(var c in b)this.errorList.push({message:b[c],element:this.findByName(c)[0]});this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.submitted={},this.lastElement=null,this.prepareForm(),this.hideErrors(),this.elements().removeClass(this.settings.errorClass).removeData("previousValue")},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b=0;for(var c in a)b++;return b},hideErrors:function(){this.addWrapper(this.toHide).hide()},valid:function(){return this.size()===0},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&a.grep(this.errorList,function(a){return a.element.name===b.name}).length===1&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea").not(":submit, :reset, :image, [disabled]").not(this.settings.ignore).filter(function(){return!this.name&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.name in c||!b.objectLength(a(this).rules())?!1:(c[this.name]=!0,!0)})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.replace(" ",".");return a(this.settings.errorElement+"."+b,this.errorContext)},reset:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([]),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c=a(b).attr("type"),d=a(b).val();return c==="radio"||c==="checkbox"?a('input[name="'+a(b).attr("name")+'"]:checked').val():typeof d=="string"?d.replace(/\r/g,""):d},check:function(b){b=this.validationTargetFor(this.clean(b));var c=a(b).rules(),d=!1,e=this.elementValue(b),f;for(var g in c){var h={method:g,parameters:c[g]};try{f=a.validator.methods[g].call(this,e,b,h.parameters);if(f==="dependency-mismatch"){d=!0;continue}d=!1;if(f==="pending"){this.toHide=this.toHide.not(this.errorsFor(b));return}if(!f)return this.formatAndAdd(b,h),!1}catch(i){throw this.settings.debug&&window.console&&console.log("exception occured when checking element "+b.id+", check the '"+h.method+"' method",i),i}}if(d)return;return this.objectLength(c)&&this.successList.push(b),!0},customMetaMessage:function(b,c){if(!a.metadata)return;var d=this.settings.meta?a(b).metadata()[this.settings.meta]:a(b).metadata();return d&&d.messages&&d.messages[c]},customDataMessage:function(b,c){return a(b).data("msg-"+c.toLowerCase())||b.attributes&&a(b).attr("data-msg-"+c.toLowerCase())},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==undefined)return arguments[a];return undefined},defaultMessage:function(b,c){return this.findDefined(this.customMessage(b.name,c),this.customDataMessage(b,c),this.customMetaMessage(b,c),!this.settings.ignoreTitle&&b.title||undefined,a.validator.messages[c],"<strong>Warning: No message defined for "+b.name+"</strong>")},formatAndAdd:function(b,c){var d=this.defaultMessage(b,c.method),e=/\$?\{(\d+)\}/g;typeof d=="function"?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),this.errorList.push({message:d,element:b}),this.errorMap[b.name]=d,this.submitted[b.name]=d},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b;for(a=0;this.errorList[a];a++){var c=this.errorList[a];this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message)}this.errorList.length&&(this.toShow=this.toShow.add(this.containers));if(this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d=this.errorsFor(b);d.length?(d.removeClass(this.settings.validClass).addClass(this.settings.errorClass),d.attr("generated")&&d.html(c)):(d=a("<"+this.settings.errorElement+"/>").attr({"for":this.idOrName(b),generated:!0}).addClass(this.settings.errorClass).html(c||""),this.settings.wrapper&&(d=d.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.append(d).length||(this.settings.errorPlacement?this.settings.errorPlacement(d,a(b)):d.insertAfter(b))),!c&&this.settings.success&&(d.text(""),typeof this.settings.success=="string"?d.addClass(this.settings.success):this.settings.success(d,b)),this.toShow=this.toShow.add(d)},errorsFor:function(b){var c=this.idOrName(b);return this.errors().filter(function(){return a(this).attr("for")===c})},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(a){return this.checkable(a)&&(a=this.findByName(a.name).not(this.settings.ignore)[0]),a},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find('[name="'+b+'"]')},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return this.dependTypes[typeof a]?this.dependTypes[typeof a](a,b):!0},dependTypes:{"boolean":function(a,b){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(a){this.pending[a.name]||(this.pendingRequest++,this.pending[a.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],c&&this.pendingRequest===0&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.formSubmitted=!1):!c&&this.pendingRequest===0&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b){return a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,"remote")})}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},attributeRules:function(b){var c={},d=a(b);for(var e in a.validator.methods){var f;e==="required"?(f=d.get(0).getAttribute(e),f===""&&(f=!0),f=!!f):f=d.attr(e),f?c[e]=f:d[0].getAttribute("type")===e&&(c[e]=!0)}return c.maxlength&&/-1|2147483647|524288/.test(c.maxlength)&&delete c.maxlength,c},metadataRules:function(b){if(!a.metadata)return{};var c=a.data(b.form,"validator").settings.meta;return c?a(b).metadata()[c]:a(b).metadata()},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1){delete b[d];return}if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=e.param!==undefined?e.param:!0:delete b[d]}}),a.each(b,function(d,e){b[d]=a.isFunction(e)?e(c):e}),a.each(["minlength","maxlength","min","max"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){b[this]&&(b[this]=[Number(b[this][0]),Number(b[this][1])])}),a.validator.autoCreateRanges&&(b.min&&b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),b.minlength&&b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b.messages&&delete b.messages,b},normalizeRule:function(b){if(typeof b=="string"){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=d!==undefined?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if(c.nodeName.toLowerCase()==="select"){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:a.trim(b).length>0},remote:function(b,c,d){if(this.optional(c))return"dependency-mismatch";var e=this.previousValue(c);this.settings.messages[c.name]||(this.settings.messages[c.name]={}),e.originalMessage=this.settings.messages[c.name].remote,this.settings.messages[c.name].remote=e.message,d=typeof d=="string"&&{url:d}||d;if(this.pending[c.name])return"pending";if(e.old===b)return e.valid;e.old=b;var f=this;this.startRequest(c);var g={};return g[c.name]=b,a.ajax(a.extend(!0,{url:d,mode:"abort",port:"validate"+c.name,dataType:"json",data:g,success:function(d){f.settings.messages[c.name].remote=e.originalMessage;var g=d===!0||d==="true";if(g){var h=f.formSubmitted;f.prepareElement(c),f.formSubmitted=h,f.successList.push(c),delete f.invalid[c.name],f.showErrors()}else{var i={},j=d||f.defaultMessage(c,"remote");i[c.name]=e.message=a.isFunction(j)?j(b):j,f.invalid[c.name]=!0,f.showErrors(i)}e.valid=g,f.stopRequest(c,g)}},d)),"pending"},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e<=d},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},email:function(a,b){return this.optional(b)||/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(a)},url:function(a,b){return this.optional(b)||/^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)},date:function(a,b){return this.optional(b)||!/Invalid|NaN/.test(new Date(a))},dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},creditcard:function(a,b){if(this.optional(b))return"dependency-mismatch";if(/[^0-9 \-]+/.test(a))return!1;var c=0,d=0,e=!1;a=a.replace(/\D/g,"");for(var f=a.length-1;f>=0;f--){var g=a.charAt(f);d=parseInt(g,10),e&&(d*=2)>9&&(d-=9),c+=d,e=!e}return c%10===0},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.unbind(".validate-equalTo").bind("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()}}}),a.format=a.validator.format})(jQuery),function(a){var b={};if(a.ajaxPrefilter)a.ajaxPrefilter(function(a,c,d){var e=a.port;a.mode==="abort"&&(b[e]&&b[e].abort(),b[e]=d)});else{var c=a.ajax;a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return e==="abort"?(b[f]&&b[f].abort(),b[f]=c.apply(this,arguments)):c.apply(this,arguments)}}}(jQuery),function(a){!jQuery.event.special.focusin&&!jQuery.event.special.focusout&&document.addEventListener&&a.each({focus:"focusin",blur:"focusout"},function(b,c){function d(b){return b=a.event.fix(b),b.type=c,a.event.handle.call(this,b)}a.event.special[c]={setup:function(){this.addEventListener(b,d,!0)},teardown:function(){this.removeEventListener(b,d,!0)},handler:function(b){var d=arguments;return d[0]=a.event.fix(b),d[0].type=c,a.event.handle.apply(this,d)}}}),a.extend(a.fn,{validateDelegate:function(b,c,d){return this.bind(c,function(c){var e=a(c.target);if(e.is(b))return d.apply(e,arguments)})}})}(jQuery)
\ No newline at end of file
+(function(a){a.extend(a.fn,{validate:function(b){if(!this.length){b&&b.debug&&window.console&&console.warn("nothing selected, can't validate, returning nothing");return}var c=a.data(this[0],"validator");return c?c:(this.attr("novalidate","novalidate"),c=new a.validator(b,this[0]),a.data(this[0],"validator",c),c.settings.onsubmit&&(this.validateDelegate(":submit","click",function(b){c.settings.submitHandler&&(c.submitButton=b.target),a(b.target).hasClass("cancel")&&(c.cancelSubmit=!0)}),this.submit(function(b){function d(){var d;return c.settings.submitHandler?(c.submitButton&&(d=a("<input type='hidden'/>").attr("name",c.submitButton.name).val(c.submitButton.value).appendTo(c.currentForm)),c.settings.submitHandler.call(c,c.currentForm,b),c.submitButton&&d.remove(),!1):!0}return c.settings.debug&&b.preventDefault(),c.cancelSubmit?(c.cancelSubmit=!1,d()):c.form()?c.pendingRequest?(c.formSubmitted=!0,!1):d():(c.focusInvalid(),!1)})),c)},valid:function(){if(a(this[0]).is("form"))return this.validate().form();var b=!0,c=a(this[0].form).validate();return this.each(function(){b&=c.element(this)}),b},removeAttrs:function(b){var c={},d=this;return a.each(b.split(/\s/),function(a,b){c[b]=d.attr(b),d.removeAttr(b)}),c},rules:function(b,c){var d=this[0];if(b){var e=a.data(d.form,"validator").settings,f=e.rules,g=a.validator.staticRules(d);switch(b){case"add":a.extend(g,a.validator.normalizeRule(c)),f[d.name]=g,c.messages&&(e.messages[d.name]=a.extend(e.messages[d.name],c.messages));break;case"remove":if(!c)return delete f[d.name],g;var h={};return a.each(c.split(/\s/),function(a,b){h[b]=g[b],delete g[b]}),h}}var i=a.validator.normalizeRules(a.extend({},a.validator.metadataRules(d),a.validator.classRules(d),a.validator.attributeRules(d),a.validator.staticRules(d)),d);if(i.required){var j=i.required;delete i.required,i=a.extend({required:j},i)}return i}}),a.extend(a.expr[":"],{blank:function(b){return!a.trim(""+b.value)},filled:function(b){return!!a.trim(""+b.value)},unchecked:function(a){return!a.checked}}),a.validator=function(b,c){this.settings=a.extend(!0,{},a.validator.defaults,b),this.currentForm=c,this.init()},a.validator.format=function(b,c){return arguments.length===1?function(){var c=a.makeArray(arguments);return c.unshift(b),a.validator.format.apply(this,c)}:(arguments.length>2&&c.constructor!==Array&&(c=a.makeArray(arguments).slice(1)),c.constructor!==Array&&(c=[c]),a.each(c,function(a,c){b=b.replace(new RegExp("\\{"+a+"\\}","g"),c)}),b)},a.extend(a.validator,{defaults:{messages:{},groups:{},rules:{},errorClass:"error",validClass:"valid",errorElement:"label",focusInvalid:!0,errorContainer:a([]),errorLabelContainer:a([]),onsubmit:!0,ignore:":hidden",ignoreTitle:!1,onfocusin:function(a,b){this.lastActive=a,this.settings.focusCleanup&&!this.blockFocusCleanup&&(this.settings.unhighlight&&this.settings.unhighlight.call(this,a,this.settings.errorClass,this.settings.validClass),this.addWrapper(this.errorsFor(a)).hide())},onfocusout:function(a,b){!this.checkable(a)&&(a.name in this.submitted||!this.optional(a))&&this.element(a)},onkeyup:function(a,b){if(b.which===9&&this.elementValue(a)==="")return;(a.name in this.submitted||a===this.lastActive)&&this.element(a)},onclick:function(a,b){a.name in this.submitted?this.element(a):a.parentNode.name in this.submitted&&this.element(a.parentNode)},highlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).addClass(c).removeClass(d):a(b).addClass(c).removeClass(d)},unhighlight:function(b,c,d){b.type==="radio"?this.findByName(b.name).removeClass(c).addClass(d):a(b).removeClass(c).addClass(d)}},setDefaults:function(b){a.extend(a.validator.defaults,b)},messages:{required:"This field is required.",remote:"Please fix this field.",email:"Please enter a valid email address.",url:"Please enter a valid URL.",date:"Please enter a valid date.",dateISO:"Please enter a valid date (ISO).",number:"Please enter a valid number.",digits:"Please enter only digits.",creditcard:"Please enter a valid credit card number.",equalTo:"Please enter the same value again.",maxlength:a.validator.format("Please enter no more than {0} characters."),minlength:a.validator.format("Please enter at least {0} characters."),rangelength:a.validator.format("Please enter a value between {0} and {1} characters long."),range:a.validator.format("Please enter a value between {0} and {1}."),max:a.validator.format("Please enter a value less than or equal to {0}."),min:a.validator.format("Please enter a value greater than or equal to {0}.")},autoCreateRanges:!1,prototype:{init:function(){function d(b){var c=a.data(this[0].form,"validator"),d="on"+b.type.replace(/^validate/,"");c.settings[d]&&c.settings[d].call(c,this[0],b)}this.labelContainer=a(this.settings.errorLabelContainer),this.errorContext=this.labelContainer.length&&this.labelContainer||a(this.currentForm),this.containers=a(this.settings.errorContainer).add(this.settings.errorLabelContainer),this.submitted={},this.valueCache={},this.pendingRequest=0,this.pending={},this.invalid={},this.reset();var b=this.groups={};a.each(this.settings.groups,function(c,d){a.each(d.split(/\s/),function(a,d){b[d]=c})});var c=this.settings.rules;a.each(c,function(b,d){c[b]=a.validator.normalizeRule(d)}),a(this.currentForm).validateDelegate(":text, [type='password'], [type='file'], select, textarea, [type='number'], [type='search'] ,[type='tel'], [type='url'], [type='email'], [type='datetime'], [type='date'], [type='month'], [type='week'], [type='time'], [type='datetime-local'], [type='range'], [type='color'] ","focusin focusout keyup",d).validateDelegate("[type='radio'], [type='checkbox'], select, option","click",d),this.settings.invalidHandler&&a(this.currentForm).bind("invalid-form.validate",this.settings.invalidHandler)},form:function(){return this.checkForm(),a.extend(this.submitted,this.errorMap),this.invalid=a.extend({},this.errorMap),this.valid()||a(this.currentForm).triggerHandler("invalid-form",[this]),this.showErrors(),this.valid()},checkForm:function(){this.prepareForm();for(var a=0,b=this.currentElements=this.elements();b[a];a++)this.check(b[a]);return this.valid()},element:function(b){b=this.validationTargetFor(this.clean(b)),this.lastElement=b,this.prepareElement(b),this.currentElements=a(b);var c=this.check(b)!==!1;return c?delete this.invalid[b.name]:this.invalid[b.name]=!0,this.numberOfInvalids()||(this.toHide=this.toHide.add(this.containers)),this.showErrors(),c},showErrors:function(b){if(b){a.extend(this.errorMap,b),this.errorList=[];for(var c in b)this.errorList.push({message:b[c],element:this.findByName(c)[0]});this.successList=a.grep(this.successList,function(a){return!(a.name in b)})}this.settings.showErrors?this.settings.showErrors.call(this,this.errorMap,this.errorList):this.defaultShowErrors()},resetForm:function(){a.fn.resetForm&&a(this.currentForm).resetForm(),this.submitted={},this.lastElement=null,this.prepareForm(),this.hideErrors(),this.elements().removeClass(this.settings.errorClass).removeData("previousValue")},numberOfInvalids:function(){return this.objectLength(this.invalid)},objectLength:function(a){var b=0;for(var c in a)b++;return b},hideErrors:function(){this.addWrapper(this.toHide).hide()},valid:function(){return this.size()===0},size:function(){return this.errorList.length},focusInvalid:function(){if(this.settings.focusInvalid)try{a(this.findLastActive()||this.errorList.length&&this.errorList[0].element||[]).filter(":visible").focus().trigger("focusin")}catch(b){}},findLastActive:function(){var b=this.lastActive;return b&&a.grep(this.errorList,function(a){return a.element.name===b.name}).length===1&&b},elements:function(){var b=this,c={};return a(this.currentForm).find("input, select, textarea").not(":submit, :reset, :image, [disabled]").not(this.settings.ignore).filter(function(){return!this.name&&b.settings.debug&&window.console&&console.error("%o has no name assigned",this),this.name in c||!b.objectLength(a(this).rules())?!1:(c[this.name]=!0,!0)})},clean:function(b){return a(b)[0]},errors:function(){var b=this.settings.errorClass.replace(" ",".");return a(this.settings.errorElement+"."+b,this.errorContext)},reset:function(){this.successList=[],this.errorList=[],this.errorMap={},this.toShow=a([]),this.toHide=a([]),this.currentElements=a([])},prepareForm:function(){this.reset(),this.toHide=this.errors().add(this.containers)},prepareElement:function(a){this.reset(),this.toHide=this.errorsFor(a)},elementValue:function(b){var c=a(b).attr("type"),d=a(b).val();return c==="radio"||c==="checkbox"?a('input[name="'+a(b).attr("name")+'"]:checked').val():typeof d=="string"?d.replace(/\r/g,""):d},check:function(b){b=this.validationTargetFor(this.clean(b));var c=a(b).rules(),d=!1,e=this.elementValue(b),f;for(var g in c){var h={method:g,parameters:c[g]};try{f=a.validator.methods[g].call(this,e,b,h.parameters);if(f==="dependency-mismatch"){d=!0;continue}d=!1;if(f==="pending"){this.toHide=this.toHide.not(this.errorsFor(b));return}if(!f)return this.formatAndAdd(b,h),!1}catch(i){throw this.settings.debug&&window.console&&console.log("exception occurred when checking element "+b.id+", check the '"+h.method+"' method",i),i}}if(d)return;return this.objectLength(c)&&this.successList.push(b),!0},customMetaMessage:function(b,c){if(!a.metadata)return;var d=this.settings.meta?a(b).metadata()[this.settings.meta]:a(b).metadata();return d&&d.messages&&d.messages[c]},customDataMessage:function(b,c){return a(b).data("msg-"+c.toLowerCase())||b.attributes&&a(b).attr("data-msg-"+c.toLowerCase())},customMessage:function(a,b){var c=this.settings.messages[a];return c&&(c.constructor===String?c:c[b])},findDefined:function(){for(var a=0;a<arguments.length;a++)if(arguments[a]!==undefined)return arguments[a];return undefined},defaultMessage:function(b,c){return this.findDefined(this.customMessage(b.name,c),this.customDataMessage(b,c),this.customMetaMessage(b,c),!this.settings.ignoreTitle&&b.title||undefined,a.validator.messages[c],"<strong>Warning: No message defined for "+b.name+"</strong>")},formatAndAdd:function(b,c){var d=this.defaultMessage(b,c.method),e=/\$?\{(\d+)\}/g;typeof d=="function"?d=d.call(this,c.parameters,b):e.test(d)&&(d=a.validator.format(d.replace(e,"{$1}"),c.parameters)),this.errorList.push({message:d,element:b}),this.errorMap[b.name]=d,this.submitted[b.name]=d},addWrapper:function(a){return this.settings.wrapper&&(a=a.add(a.parent(this.settings.wrapper))),a},defaultShowErrors:function(){var a,b;for(a=0;this.errorList[a];a++){var c=this.errorList[a];this.settings.highlight&&this.settings.highlight.call(this,c.element,this.settings.errorClass,this.settings.validClass),this.showLabel(c.element,c.message)}this.errorList.length&&(this.toShow=this.toShow.add(this.containers));if(this.settings.success)for(a=0;this.successList[a];a++)this.showLabel(this.successList[a]);if(this.settings.unhighlight)for(a=0,b=this.validElements();b[a];a++)this.settings.unhighlight.call(this,b[a],this.settings.errorClass,this.settings.validClass);this.toHide=this.toHide.not(this.toShow),this.hideErrors(),this.addWrapper(this.toShow).show()},validElements:function(){return this.currentElements.not(this.invalidElements())},invalidElements:function(){return a(this.errorList).map(function(){return this.element})},showLabel:function(b,c){var d=this.errorsFor(b);d.length?(d.removeClass(this.settings.validClass).addClass(this.settings.errorClass),d.attr("generated")&&d.html(c)):(d=a("<"+this.settings.errorElement+"/>").attr({"for":this.idOrName(b),generated:!0}).addClass(this.settings.errorClass).html(c||""),this.settings.wrapper&&(d=d.hide().show().wrap("<"+this.settings.wrapper+"/>").parent()),this.labelContainer.append(d).length||(this.settings.errorPlacement?this.settings.errorPlacement(d,a(b)):d.insertAfter(b))),!c&&this.settings.success&&(d.text(""),typeof this.settings.success=="string"?d.addClass(this.settings.success):this.settings.success(d,b)),this.toShow=this.toShow.add(d)},errorsFor:function(b){var c=this.idOrName(b);return this.errors().filter(function(){return a(this).attr("for")===c})},idOrName:function(a){return this.groups[a.name]||(this.checkable(a)?a.name:a.id||a.name)},validationTargetFor:function(a){return this.checkable(a)&&(a=this.findByName(a.name).not(this.settings.ignore)[0]),a},checkable:function(a){return/radio|checkbox/i.test(a.type)},findByName:function(b){return a(this.currentForm).find('[name="'+b+'"]')},getLength:function(b,c){switch(c.nodeName.toLowerCase()){case"select":return a("option:selected",c).length;case"input":if(this.checkable(c))return this.findByName(c.name).filter(":checked").length}return b.length},depend:function(a,b){return this.dependTypes[typeof a]?this.dependTypes[typeof a](a,b):!0},dependTypes:{"boolean":function(a,b){return a},string:function(b,c){return!!a(b,c.form).length},"function":function(a,b){return a(b)}},optional:function(b){var c=this.elementValue(b);return!a.validator.methods.required.call(this,c,b)&&"dependency-mismatch"},startRequest:function(a){this.pending[a.name]||(this.pendingRequest++,this.pending[a.name]=!0)},stopRequest:function(b,c){this.pendingRequest--,this.pendingRequest<0&&(this.pendingRequest=0),delete this.pending[b.name],c&&this.pendingRequest===0&&this.formSubmitted&&this.form()?(a(this.currentForm).submit(),this.formSubmitted=!1):!c&&this.pendingRequest===0&&this.formSubmitted&&(a(this.currentForm).triggerHandler("invalid-form",[this]),this.formSubmitted=!1)},previousValue:function(b){return a.data(b,"previousValue")||a.data(b,"previousValue",{old:null,valid:!0,message:this.defaultMessage(b,"remote")})}},classRuleSettings:{required:{required:!0},email:{email:!0},url:{url:!0},date:{date:!0},dateISO:{dateISO:!0},number:{number:!0},digits:{digits:!0},creditcard:{creditcard:!0}},addClassRules:function(b,c){b.constructor===String?this.classRuleSettings[b]=c:a.extend(this.classRuleSettings,b)},classRules:function(b){var c={},d=a(b).attr("class");return d&&a.each(d.split(" "),function(){this in a.validator.classRuleSettings&&a.extend(c,a.validator.classRuleSettings[this])}),c},attributeRules:function(b){var c={},d=a(b);for(var e in a.validator.methods){var f;e==="required"?(f=d.get(0).getAttribute(e),f===""&&(f=!0),f=!!f):f=d.attr(e),f?c[e]=f:d[0].getAttribute("type")===e&&(c[e]=!0)}return c.maxlength&&/-1|2147483647|524288/.test(c.maxlength)&&delete c.maxlength,c},metadataRules:function(b){if(!a.metadata)return{};var c=a.data(b.form,"validator").settings.meta;return c?a(b).metadata()[c]:a(b).metadata()},staticRules:function(b){var c={},d=a.data(b.form,"validator");return d.settings.rules&&(c=a.validator.normalizeRule(d.settings.rules[b.name])||{}),c},normalizeRules:function(b,c){return a.each(b,function(d,e){if(e===!1){delete b[d];return}if(e.param||e.depends){var f=!0;switch(typeof e.depends){case"string":f=!!a(e.depends,c.form).length;break;case"function":f=e.depends.call(c,c)}f?b[d]=e.param!==undefined?e.param:!0:delete b[d]}}),a.each(b,function(d,e){b[d]=a.isFunction(e)?e(c):e}),a.each(["minlength","maxlength","min","max"],function(){b[this]&&(b[this]=Number(b[this]))}),a.each(["rangelength","range"],function(){b[this]&&(b[this]=[Number(b[this][0]),Number(b[this][1])])}),a.validator.autoCreateRanges&&(b.min&&b.max&&(b.range=[b.min,b.max],delete b.min,delete b.max),b.minlength&&b.maxlength&&(b.rangelength=[b.minlength,b.maxlength],delete b.minlength,delete b.maxlength)),b.messages&&delete b.messages,b},normalizeRule:function(b){if(typeof b=="string"){var c={};a.each(b.split(/\s/),function(){c[this]=!0}),b=c}return b},addMethod:function(b,c,d){a.validator.methods[b]=c,a.validator.messages[b]=d!==undefined?d:a.validator.messages[b],c.length<3&&a.validator.addClassRules(b,a.validator.normalizeRule(b))},methods:{required:function(b,c,d){if(!this.depend(d,c))return"dependency-mismatch";if(c.nodeName.toLowerCase()==="select"){var e=a(c).val();return e&&e.length>0}return this.checkable(c)?this.getLength(b,c)>0:a.trim(b).length>0},remote:function(b,c,d){if(this.optional(c))return"dependency-mismatch";var e=this.previousValue(c);this.settings.messages[c.name]||(this.settings.messages[c.name]={}),e.originalMessage=this.settings.messages[c.name].remote,this.settings.messages[c.name].remote=e.message,d=typeof d=="string"&&{url:d}||d;if(this.pending[c.name])return"pending";if(e.old===b)return e.valid;e.old=b;var f=this;this.startRequest(c);var g={};return g[c.name]=b,a.ajax(a.extend(!0,{url:d,mode:"abort",port:"validate"+c.name,dataType:"json",data:g,success:function(d){f.settings.messages[c.name].remote=e.originalMessage;var g=d===!0||d==="true";if(g){var h=f.formSubmitted;f.prepareElement(c),f.formSubmitted=h,f.successList.push(c),delete f.invalid[c.name],f.showErrors()}else{var i={},j=d||f.defaultMessage(c,"remote");i[c.name]=e.message=a.isFunction(j)?j(b):j,f.invalid[c.name]=!0,f.showErrors(i)}e.valid=g,f.stopRequest(c,g)}},d)),"pending"},minlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d},maxlength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e<=d},rangelength:function(b,c,d){var e=a.isArray(b)?b.length:this.getLength(a.trim(b),c);return this.optional(c)||e>=d[0]&&e<=d[1]},min:function(a,b,c){return this.optional(b)||a>=c},max:function(a,b,c){return this.optional(b)||a<=c},range:function(a,b,c){return this.optional(b)||a>=c[0]&&a<=c[1]},email:function(a,b){return this.optional(b)||/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))$/i.test(a)},url:function(a,b){return this.optional(b)||/^(https?|ftp):\/\/(((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:)*@)?(((\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])\.(\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5]))|((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?)(:\d*)?)(\/((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)+(\/(([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)*)*)?)?(\?((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|[\uE000-\uF8FF]|\/|\?)*)?(\#((([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(%[\da-f]{2})|[!\$&'\(\)\*\+,;=]|:|@)|\/|\?)*)?$/i.test(a)},date:function(a,b){return this.optional(b)||!/Invalid|NaN/.test(new Date(a))},dateISO:function(a,b){return this.optional(b)||/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}$/.test(a)},number:function(a,b){return this.optional(b)||/^-?(?:\d+|\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(a)},digits:function(a,b){return this.optional(b)||/^\d+$/.test(a)},creditcard:function(a,b){if(this.optional(b))return"dependency-mismatch";if(/[^0-9 \-]+/.test(a))return!1;var c=0,d=0,e=!1;a=a.replace(/\D/g,"");for(var f=a.length-1;f>=0;f--){var g=a.charAt(f);d=parseInt(g,10),e&&(d*=2)>9&&(d-=9),c+=d,e=!e}return c%10===0},equalTo:function(b,c,d){var e=a(d);return this.settings.onfocusout&&e.unbind(".validate-equalTo").bind("blur.validate-equalTo",function(){a(c).valid()}),b===e.val()}}}),a.format=a.validator.format})(jQuery),function(a){var b={};if(a.ajaxPrefilter)a.ajaxPrefilter(function(a,c,d){var e=a.port;a.mode==="abort"&&(b[e]&&b[e].abort(),b[e]=d)});else{var c=a.ajax;a.ajax=function(d){var e=("mode"in d?d:a.ajaxSettings).mode,f=("port"in d?d:a.ajaxSettings).port;return e==="abort"?(b[f]&&b[f].abort(),b[f]=c.apply(this,arguments)):c.apply(this,arguments)}}}(jQuery),function(a){!jQuery.event.special.focusin&&!jQuery.event.special.focusout&&document.addEventListener&&a.each({focus:"focusin",blur:"focusout"},function(b,c){function d(b){return b=a.event.fix(b),b.type=c,a.event.handle.call(this,b)}a.event.special[c]={setup:function(){this.addEventListener(b,d,!0)},teardown:function(){this.removeEventListener(b,d,!0)},handler:function(b){var d=arguments;return d[0]=a.event.fix(b),d[0].type=c,a.event.handle.apply(this,d)}}}),a.extend(a.fn,{validateDelegate:function(b,c,d){return this.bind(c,function(c){var e=a(c.target);if(e.is(b))return d.apply(e,arguments)})}})}(jQuery)
\ No newline at end of file
diff --git a/modules/admin/j2store_chart/tmpl/default.php b/modules/admin/j2store_chart/tmpl/default.php
index 2fac4cf..e3e206a 100755
--- a/modules/admin/j2store_chart/tmpl/default.php
+++ b/modules/admin/j2store_chart/tmpl/default.php
@@ -57,7 +57,7 @@ function drawChart_'.$module_id.'() {
  */
 foreach($months as $item) {
 
-    //$months = array('','January','Feb','March','April','May','June','July','Auguest','Sep','Oct','Nov','Dec');
+    //$months = array('','January','Feb','March','April','May','June','July','August','Sep','Oct','Nov','Dec');
 
     //month charts properties.
     $script .='
diff --git a/modules/admin/j2store_stats/tmpl/default.php b/modules/admin/j2store_stats/tmpl/default.php
index 1474317..e70f0b1 100755
--- a/modules/admin/j2store_stats/tmpl/default.php
+++ b/modules/admin/j2store_stats/tmpl/default.php
@@ -263,7 +263,7 @@
 			<td><strong><?php echo JText::_('J2STORE_TOTAL_CONFIRMED_ORDERS_TODAY'); ?></strong></td>
 			<td><strong>
 			<?php
-				$tommorow = JFactory::getDate ('now +1 days',$tz)->format ( 'Y-m-d' );
+				$tomorrow = JFactory::getDate ('now +1 days',$tz)->format ( 'Y-m-d' );
 			?>
 			<?php
 				echo F0FModel::getTmpInstance('Orders', 'J2StoreModel')->clearState()
diff --git a/modules/admin/j2store_stats_mini/tmpl/default.php b/modules/admin/j2store_stats_mini/tmpl/default.php
index b4448f4..f5f0b89 100755
--- a/modules/admin/j2store_stats_mini/tmpl/default.php
+++ b/modules/admin/j2store_stats_mini/tmpl/default.php
@@ -24,14 +24,14 @@
                 <?php
                 $tz = JFactory::getConfig()->get('offset');
                 $today = JFactory::getDate('now', $tz)->format('Y-m-d');
-                $tommorow = JFactory::getDate('now +1 days', $tz)->format('Y-m-d');
+                $tomorrow = JFactory::getDate('now +1 days', $tz)->format('Y-m-d');
                 ?>
                 <span class="j2store-mini-price">
 			<?php
             echo $currency->format(
                 F0FModel::getTmpInstance('Orders', 'J2StoreModel')->clearState()
                     ->since($today)
-                    ->until($tommorow)
+                    ->until($tomorrow)
                     ->orderstatus($order_status)
                     ->nozero(1)
                     ->moneysum(1)
diff --git a/plugins/content/j2store/j2store.php b/plugins/content/j2store/j2store.php
index 2980175..c695496 100755
--- a/plugins/content/j2store/j2store.php
+++ b/plugins/content/j2store/j2store.php
@@ -285,7 +285,7 @@ function onContentPrepareForm($form, $data)
         J2Store::plugin()->event( 'AfterContentPrepareForm', array( $form, $data ) );
         if ( ! $message_display )
         {
-            $app->enqueueMessage( JText::_( 'J2STORE_TAB_NOT_DISPLY_IN_CONTENT' ), 'waring' );
+            $app->enqueueMessage( JText::_( 'J2STORE_TAB_NOT_DISPLAY_IN_CONTENT' ), 'warning' );
         }
         return true;
     }
diff --git a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_configurableoptions.php b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_configurableoptions.php
index 5defedc..6182cdb 100755
--- a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_configurableoptions.php
@@ -249,7 +249,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_filters.php b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_filters.php
index a739d18..6e82f46 100755
--- a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_filters.php
+++ b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/bootstrap3/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $catid = JFactory::getApplication()->input->get('catid',array(),'Array');?>
 <?php
diff --git a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_configurableoptions.php b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_configurableoptions.php
index fe47661..fb5c5e1 100755
--- a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_configurableoptions.php
@@ -245,7 +245,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_filters.php b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_filters.php
index 273c1c6..6e45202 100755
--- a/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_filters.php
+++ b/plugins/j2store/app_bootstrap3/app_bootstrap3/tmpl/tag_bootstrap3/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $tagid = JFactory::getApplication()->input->getInt('tagid',0);?>
 <?php
diff --git a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_configurableoptions.php b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_configurableoptions.php
index 5defedc..6182cdb 100755
--- a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_configurableoptions.php
@@ -249,7 +249,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_filters.php b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_filters.php
index 327ecb5..dc22b5c 100755
--- a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_filters.php
+++ b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/bootstrap4/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $catid = JFactory::getApplication()->input->get('catid',array(),'Array');?>
 <?php
diff --git a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_configurableoptions.php b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_configurableoptions.php
index ad38e76..175c021 100755
--- a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_configurableoptions.php
@@ -247,7 +247,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_filters.php b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_filters.php
index f5c4397..7ac4dd0 100755
--- a/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_filters.php
+++ b/plugins/j2store/app_bootstrap4/app_bootstrap4/tmpl/tag_bootstrap4/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $tagid = JFactory::getApplication()->input->getInt('tagid',0);?>
 <?php
diff --git a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_configurableoptions.php b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_configurableoptions.php
index 5defedc..6182cdb 100755
--- a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_configurableoptions.php
@@ -249,7 +249,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_filters.php b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_filters.php
index 327ecb5..dc22b5c 100755
--- a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_filters.php
+++ b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/bootstrap5/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $catid = JFactory::getApplication()->input->get('catid',array(),'Array');?>
 <?php
diff --git a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_configurableoptions.php b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_configurableoptions.php
index ad38e76..175c021 100755
--- a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_configurableoptions.php
+++ b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_configurableoptions.php
@@ -247,7 +247,7 @@ class="btn btn-default">
         	<div id="ChildOptions<?php echo $option['productoption_id']; ?>"></div>
 
         <?php } ?>
-        	<div id="ChildOptio<?php echo $option['productoption_id']; ?>"></div>
+        	<div id="Childoption<?php echo $option['productoption_id']; ?>"></div>
       </div>
       <?php } ?>
 
diff --git a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_filters.php b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_filters.php
index f5c4397..7ac4dd0 100755
--- a/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_filters.php
+++ b/plugins/j2store/app_bootstrap5/app_bootstrap5/tmpl/tag_bootstrap5/default_filters.php
@@ -21,7 +21,7 @@
 
 $currency = $this->currency->getSymbol();
 $currency_value = $this->currency->getValue();
-$thousand = $this->currency->getThousandSysmbol();
+$thousand = $this->currency->getThousandSymbol();
 $decimal_place = $this->currency->getDecimalPlace();
 $tagid = JFactory::getApplication()->input->getInt('tagid',0);?>
 <?php
diff --git a/plugins/j2store/app_diagnostics/app_diagnostics.php b/plugins/j2store/app_diagnostics/app_diagnostics.php
index 18a7a05..842f919 100755
--- a/plugins/j2store/app_diagnostics/app_diagnostics.php
+++ b/plugins/j2store/app_diagnostics/app_diagnostics.php
@@ -75,7 +75,7 @@ public function getInfo()
         $info['sapi_name'] = php_sapi_name();
         $info['version'] = $version->getLongVersion();
         $info['useragent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "";
-        $info['j2store_version'] = $this->getJ2storeVerion();
+        $info['j2store_version'] = $this->getJ2storeVersion();
         $info['is_pro'] = J2Store::isPro();
         $info['curl'] = $this->_isCurl();
         $info['json'] = $this->_isJson();
@@ -99,7 +99,7 @@ function _isJson()
         return (function_exists('json_encode')) ? JText::_('J2STORE_ENABLED') : JText::_('J2STORE_DISABLED');
     }
 
-    public function getJ2storeVerion()
+    public function getJ2storeVersion()
     {
         $version = '';
         $db = JFactory::getDbo();
diff --git a/plugins/j2store/app_flexivariable/app_flexivariable/controller.php b/plugins/j2store/app_flexivariable/app_flexivariable/controller.php
index e6e504f..8588bd1 100755
--- a/plugins/j2store/app_flexivariable/app_flexivariable/controller.php
+++ b/plugins/j2store/app_flexivariable/app_flexivariable/controller.php
@@ -33,9 +33,9 @@ public function addFlexiVariant()
         $app = J2Store::platform()->application();
         $fof_helper = J2Store::fof();
         $post = $app->input->getArray($_REQUEST);
-        if (isset($post['varient_combin']) && !empty($post['varient_combin']) && isset($post['flexi_product_id']) && !empty($post['flexi_product_id'])) {
+        if (isset($post['variant_combin']) && !empty($post['variant_combin']) && isset($post['flexi_product_id']) && !empty($post['flexi_product_id'])) {
             $product_optionvalue_ids = array();
-            foreach ($post['varient_combin'] as $variant_key => $variant_value) {
+            foreach ($post['variant_combin'] as $variant_key => $variant_value) {
                 //get Product Option 
                 $product_option = $fof_helper->getModel('ProductOption', 'J2StoreModel')->getItem($variant_key);
                 // save to Product OptionValues
@@ -191,9 +191,9 @@ public function deleteSingleVariant($id)
                 $this->setError($e->getMessage());
                 return false;
             }
-            $varaint_table = $fof_helper->loadTable('Variant', 'J2StoreTable');
-            if ($varaint_table->load($id)) {
-                $varaint_table->delete();
+            $variant_table = $fof_helper->loadTable('Variant', 'J2StoreTable');
+            if ($variant_table->load($id)) {
+                $variant_table->delete();
             }
         } catch (\Exception $e) {
             $this->setError($e->getMessage());
diff --git a/plugins/j2store/payment_cash/payment_cash.php b/plugins/j2store/payment_cash/payment_cash.php
index 50248ee..34c5df5 100755
--- a/plugins/j2store/payment_cash/payment_cash.php
+++ b/plugins/j2store/payment_cash/payment_cash.php
@@ -20,7 +20,7 @@ class plgJ2StorePayment_cash extends J2StorePaymentPlugin
     /**
      * Constructor
      *
-     * For php4 compatability we must not use the __constructor as a constructor for plugins
+     * For php4 compatibility we must not use the __constructor as a constructor for plugins
      * because func_get_args ( void ) returns a copy of all passed arguments NOT references.
      * This causes problems with cross-referencing necessary for the observer design pattern.
      *
diff --git a/plugins/j2store/payment_moneyorder/payment_moneyorder.php b/plugins/j2store/payment_moneyorder/payment_moneyorder.php
index 6568b94..305630e 100755
--- a/plugins/j2store/payment_moneyorder/payment_moneyorder.php
+++ b/plugins/j2store/payment_moneyorder/payment_moneyorder.php
@@ -25,7 +25,7 @@ class plgJ2StorePayment_moneyorder extends J2StorePaymentPlugin
 	/**
 	 * Constructor
 	 *
-	 * For php4 compatability we must not use the __constructor as a constructor for plugins
+	 * For php4 compatibility we must not use the __constructor as a constructor for plugins
 	 * because func_get_args ( void ) returns a copy of all passed arguments NOT references.
 	 * This causes problems with cross-referencing necessary for the observer design pattern.
 	 *
diff --git a/plugins/j2store/payment_paypal/languages/en-GB.plg_j2store_payment_paypal.ini b/plugins/j2store/payment_paypal/languages/en-GB.plg_j2store_payment_paypal.ini
index 7cac1c2..2c8711b 100755
--- a/plugins/j2store/payment_paypal/languages/en-GB.plg_j2store_payment_paypal.ini
+++ b/plugins/j2store/payment_paypal/languages/en-GB.plg_j2store_payment_paypal.ini
@@ -84,13 +84,13 @@ J2STORE_PAYPAL_SANDBOX_API_PASSWORD="Sandbox API Password"
 J2STORE_PAYPAL_SANDBOX_API_PASSWORD_DESC="Sandbox API Password as provided at http://developer.paypal.com"
 J2STORE_PAYPAL_SANDBOX_API_SIGNATURE="Sandbox API Signature"
 J2STORE_PAYPAL_SANDBOX_API_SIGNATURE_DESC="Sandbox API Signature as provided at http://developer.paypal.com"
-J2STORE_PAYPAL_BILLING_AGGREEMENT_TEXT_LABEL="Billing agreement text"
-J2STORE_PAYPAL_BILLING_AGGREEMENT_TEXT_DESC="Billing agreement description which displays in payment page for subscription product"
+J2STORE_PAYPAL_BILLING_AGREEMENT_TEXT_LABEL="Billing agreement text"
+J2STORE_PAYPAL_BILLING_AGREEMENT_TEXT_DESC="Billing agreement description which displays in payment page for subscription product"
 J2STORE_PAYMENT_PAYPALSUBSCRIPTION_FAILED_TOCREATE_TOKEN="Failed to create token"
 J2STORE_PAYMENT_PAYPALSUBSCRIPTION_ORDER_DESCRIPTION="Order Description"
 J2STORE_PAYPAL_CUSTOM_NOTE="Learn how to get your API credentials from your PayPal account from the following url <a target='_blank' href='https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature'>https://developer.paypal.com/docs/classic/api/apiCredentials/#create-an-api-signature</a>"
-J2STORE_PAYPAL_SHOW_BILLING_AGGREEMENT_TEXT_LABEL="Show billing agreement"
-J2STORE_PAYPAL_SHOW_BILLING_AGGREEMENT_TEXT_LABEL_DESC="Displays custom billing aggrement text for subscription products"
+J2STORE_PAYPAL_SHOW_BILLING_AGREEMENT_TEXT_LABEL="Show billing agreement"
+J2STORE_PAYPAL_SHOW_BILLING_AGREEMENT_TEXT_LABEL_DESC="Displays custom billing aggrement text for subscription products"
 J2STORE_PAYPAL_NOTIFY_URL_TYPE="Choose the Callback URL to be used for IPN notifications"
 J2STORE_PAYPAL_NOTIFY_URL_TYPE_DESC="The default should be the Query string based url. If this does not work, you can try the secondary callback url. In a few cases, PayPal IPN servers might not be able to post back to urls with query strings. In those cases you can use either alternative 1 or alternative 2"
 J2STORE_PAYPAL_ALTERNATIVE_URL="Alternative 2:  Url without a query string (http(s)://www.example.com/plugins/j2store/payment_paypal/payment_paypal/tmpl/notify.php)"
diff --git a/plugins/j2store/payment_paypal/payment_paypal.php b/plugins/j2store/payment_paypal/payment_paypal.php
index 7769ec2..76897f7 100755
--- a/plugins/j2store/payment_paypal/payment_paypal.php
+++ b/plugins/j2store/payment_paypal/payment_paypal.php
@@ -28,7 +28,7 @@ class plgJ2StorePayment_paypal extends J2StorePaymentPlugin
     /**
      * Constructor
      *
-     * For php4 compatability we must not use the __constructor as a constructor for plugins
+     * For php4 compatibility we must not use the __constructor as a constructor for plugins
      * because func_get_args ( void ) returns a copy of all passed arguments NOT references.
      * This causes problems with cross-referencing necessary for the observer design pattern.
      *
@@ -385,7 +385,7 @@ function _prePayment( $data )
     /**
      * Get payment for renewal using billing ID
      * */
-    protected function byRefference($subscription, $order){
+    protected function byReference($subscription, $order){
         $expressCheckout = PaypalExpressCheckoutForJ2StoreSubscriptionProduct::getInstance($this->params);
         $hasAPI = $expressCheckout->checkSetAPI();
         if(!$hasAPI){
@@ -751,7 +751,7 @@ public function getItemsFromOrderForReferenceTransaction($order){
      * */
     function onJ2StoreProcessRenewalPayment($paymentType, $subscription, $order){
         if($paymentType == $this->_element){
-            $this->byRefference($subscription, $order);
+            $this->byReference($subscription, $order);
         }
     }
 
diff --git a/plugins/j2store/payment_paypal/payment_paypal.xml b/plugins/j2store/payment_paypal/payment_paypal.xml
index eb81d44..0776201 100755
--- a/plugins/j2store/payment_paypal/payment_paypal.xml
+++ b/plugins/j2store/payment_paypal/payment_paypal.xml
@@ -60,11 +60,11 @@
                        label="j2store_paypal_custom_note_recurring"/>
 
                 <field type="spacer" />
-                <field name="show_billing_aggrement_text" type="radio" default="0" label="J2STORE_PAYPAL_SHOW_BILLING_AGGREEMENT_TEXT_LABEL" description="J2STORE_PAYPAL_SHOW_BILLING_AGGREEMENT_TEXT_LABEL_DESC">
+                <field name="show_billing_aggrement_text" type="radio" default="0" label="J2STORE_PAYPAL_SHOW_BILLING_AGREEMENT_TEXT_LABEL" description="J2STORE_PAYPAL_SHOW_BILLING_AGREEMENT_TEXT_LABEL_DESC">
                     <option value="0">No</option>
                     <option value="1">Yes</option>
                 </field>
-                <field name="billing_aggrement_text" type="text" size="50"  maxlength="127" default="Automatic payments for subscription product" label="J2STORE_PAYPAL_BILLING_AGGREEMENT_TEXT_LABEL" description="J2STORE_PAYPAL_BILLING_AGGREEMENT_TEXT_DESC"/>
+                <field name="billing_aggrement_text" type="text" size="50"  maxlength="127" default="Automatic payments for subscription product" label="J2STORE_PAYPAL_BILLING_AGREEMENT_TEXT_LABEL" description="J2STORE_PAYPAL_BILLING_AGREEMENT_TEXT_DESC"/>
 
                 <field name="paypal_note_common" type="customnotice" addfieldpath="/administrator/components/com_j2store/models/fields"
                        label="j2store_paypal_custom_note_common"/>
diff --git a/plugins/j2store/payment_sagepayform/payment_sagepayform.php b/plugins/j2store/payment_sagepayform/payment_sagepayform.php
index 0420b5f..c5d7003 100755
--- a/plugins/j2store/payment_sagepayform/payment_sagepayform.php
+++ b/plugins/j2store/payment_sagepayform/payment_sagepayform.php
@@ -26,7 +26,7 @@ class plgJ2StorePayment_sagepayform extends J2StorePaymentPlugin
     /**
      * Constructor
      *
-     * For php4 compatability we must not use the __constructor as a constructor for plugins
+     * For php4 compatibility we must not use the __constructor as a constructor for plugins
      * because func_get_args ( void ) returns a copy of all passed arguments NOT references.
      * This causes problems with cross-referencing necessary for the observer design pattern.
      *
diff --git a/plugins/j2store/report_itemised/report_itemised/models/reportitemised.php b/plugins/j2store/report_itemised/report_itemised/models/reportitemised.php
index 1fb4253..5d1f3b5 100755
--- a/plugins/j2store/report_itemised/report_itemised/models/reportitemised.php
+++ b/plugins/j2store/report_itemised/report_itemised/models/reportitemised.php
@@ -288,7 +288,7 @@ public function export($data)
     }
 
     /**
-     * Method to get Header Fileds for file Export
+     * Method to get Header FIELDS for file Export
      * @return array;
      */
     public function getHeaderfields($export_data)
diff --git a/plugins/j2store/report_products/report_products.php b/plugins/j2store/report_products/report_products.php
index 2deb62c..8718c35 100755
--- a/plugins/j2store/report_products/report_products.php
+++ b/plugins/j2store/report_products/report_products.php
@@ -230,7 +230,7 @@ public function getVat(){
             'without_tax' => JText::_('J2STORE_WITHOUT_TAX')
         );
     }
-    //search fiter type
+    //search filter type
     public function getFilterType(){
         return array(
             'order' => 'By Order',
diff --git a/plugins/j2store/shipping_standard/shipping_standard.php b/plugins/j2store/shipping_standard/shipping_standard.php
index 394e62a..19ec194 100755
--- a/plugins/j2store/shipping_standard/shipping_standard.php
+++ b/plugins/j2store/shipping_standard/shipping_standard.php
@@ -192,7 +192,7 @@ protected function getTotal( $shipping_method_id, $geozones, $order, $geozones_t
     		return $return;
     	}
 
-    	//initliase cart model
+    	//initialise cart model
     	switch($shippingmethod->shipping_method_type)
     	{
     		case "2":
diff --git a/plugins/j2store/shipping_standard/shipping_standard/tmpl/view.php b/plugins/j2store/shipping_standard/shipping_standard/tmpl/view.php
index 39fef87..4e0e878 100755
--- a/plugins/j2store/shipping_standard/shipping_standard/tmpl/view.php
+++ b/plugins/j2store/shipping_standard/shipping_standard/tmpl/view.php
@@ -123,9 +123,9 @@
 	</div>
 		<div class="<?php echo $col_class;?>4">
 		    <div class="alert alert-block alert-info">
-		        <stong>
+		        <strong>
 		        <?php echo JText::_('J2STORE_SHIPPING_TYPE_HELP_TEXT'); ?>:
-		        </stong>
+		        </strong>
 		        <ul>
 		            <li><?php echo JText::_('J2STORE_FLAT_RATE_PER_ITEM_HELP_TEXT'); ?></li>
 		            <li><?php echo JText::_('J2STORE_WEIGHT_BASED_PER_ITEM_HELP_TEXT'); ?></li>
diff --git a/plugins/user/j2userregister/j2userregister.xml b/plugins/user/j2userregister/j2userregister.xml
index 094a571..a069077 100755
--- a/plugins/user/j2userregister/j2userregister.xml
+++ b/plugins/user/j2userregister/j2userregister.xml
@@ -26,7 +26,7 @@
                     <option value="0">J2STORE_HIDE</option>
                     <option value="1">J2STORE_SHOW</option>
                 </field>
-                <field name="field_html" type="textarea" filter="safehtml" label="J2STORE_J2USERREGISTER_FILEDS_HTML" />
+                <field name="field_html" type="textarea" filter="safehtml" label="J2STORE_J2USERREGISTER_FIELDS_HTML" />
 
                 <field name="show_myprofile" type="radio" default="0" class="btn-group" label="J2STORE_J2USERREGISTER_SHOW_MYPROFILE"
                        description="J2STORE_J2USERREGISTER_SHOW_MYPROFILE_DESC"
diff --git a/plugins/user/j2userregister/tmpl/form_fields.php b/plugins/user/j2userregister/tmpl/form_fields.php
index 5b898d6..17e539c 100755
--- a/plugins/user/j2userregister/tmpl/form_fields.php
+++ b/plugins/user/j2userregister/tmpl/form_fields.php
@@ -64,7 +64,7 @@
 			if(isset( $vars->address_default[$fieldName] ) && !empty( $vars->address_default[$fieldName] )){
 				$vars->address->$fieldName = $vars->address_default[$fieldName];
 			}
-			$html = str_replace('['.$fieldName.']',$vars->selectableBase->getFormatedDisplay($oneExtraField,$vars->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
+			$html = str_replace('['.$fieldName.']',$vars->selectableBase->getFormattedDisplay($oneExtraField,$vars->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null).'</br />',$html);
 		}
 	endforeach;
 	//check for unprocessed fields. If the user forgot to add the fields to the checkout layout in store profile, we probably have some.
@@ -94,7 +94,7 @@
 						if(isset( $vars->address_default[$fieldName] ) && !empty( $vars->address_default[$fieldName] )){
 							$vars->address->$fieldName = $vars->address_default[$fieldName];
 						}
-						$uhtml .= $vars->selectableBase->getFormatedDisplay($oneExtraField,$vars->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
+						$uhtml .= $vars->selectableBase->getFormattedDisplay($oneExtraField,$vars->address->$fieldName, $fieldName,false, $options = '', $test = false, $allFields, $allValues = null);
 						$uhtml .='<br />';
 					}
 				endforeach;
diff --git a/script.j2store.php b/script.j2store.php
index 0a69ad2..a110f85 100755
--- a/script.j2store.php
+++ b/script.j2store.php
@@ -490,7 +490,7 @@ function _installLocalisation($parent) {
 		$alltables = $db->getTableList();
 		//get prefix
 		$prefix = $db->getPrefix();
-		// we have to seperate try catch , because may country install fail, zone table also get affect install
+		// we have to separate try catch , because may country install fail, zone table also get affect install
 		try{
 			$country_status = false;
 			if(!in_array($prefix.'j2store_countries', $alltables)){