diff --git a/assets/scripts/atomicexplorer.js b/assets/scripts/atomicexplorer.js
index 4221c88..88fa970 100644
--- a/assets/scripts/atomicexplorer.js
+++ b/assets/scripts/atomicexplorer.js
@@ -1,17 +1,5 @@
 var AtomicExplorer = function() {
-	toastr.options = {
-		'closeButton': true,
-		'debug': false,
-		'positionClass': 'toast-bottom-right',
-		'showDuration': '5000',
-		'hideDuration': '1000',
-		'timeOut': '5000',
-		'extendedTimeOut': '1000',
-		'showEasing': 'swing',
-		'hideEasing': 'linear',
-		'showMethod': 'fadeIn',
-		'hideMethod': 'fadeOut'
-	};
+	toastr.options = toastrConfig;
 
 	var handleExplorer = function() {
 		$('#atomic_explorer_getcoinpeers_btn').click(function() {
diff --git a/assets/scripts/iguana_api/IguanaAddcoin.js b/assets/scripts/iguana_api/IguanaAddcoin.js
index 028efb1..0b0e81b 100644
--- a/assets/scripts/iguana_api/IguanaAddcoin.js
+++ b/assets/scripts/iguana_api/IguanaAddcoin.js
@@ -1,8 +1,6 @@
 // TODO: refactor
 
 function Iguana_addcoin(addcoin_data) {
-	console.log('addcoin data');
-	console.log(addcoin_data);
 	var tmpPendValue = sessionStorage.getItem('IguanaPendValue');
 
 	if (addcoin_data.coin !== 'BTC' && addcoin_data.coin !== 'LTC' && addcoin_data.coin !== 'DOGE') {
@@ -322,7 +320,7 @@ function Iguana_addcoin(addcoin_data) {
 			'debug': 0,
 			'seedipaddr': '78.47.196.146'
 		};
-		var acConfig = {
+		const acConfig = {
 			'SUPERNET': {
 				'name': 'SUPERNET',
 				'supply': 816061,
diff --git a/assets/scripts/kmd_wallet/KMDTransaction.js b/assets/scripts/kmd_wallet/KMDTransaction.js
index 181ea26..7e813cb 100644
--- a/assets/scripts/kmd_wallet/KMDTransaction.js
+++ b/assets/scripts/kmd_wallet/KMDTransaction.js
@@ -39,9 +39,9 @@ function KMDGetPublicTransactions() {
 
 			$.each(AjaxOutputData, function(index, value) {
 				var tmp_category = '',
-						tmp_addr = AjaxOutputData[index].address;
+						tmp_addr = AjaxOutputData[index] ? AjaxOutputData[index].address : '';
 
-				if (!('address' in AjaxOutputData[index])) {
+				if (AjaxOutputData[index] && !('address' in AjaxOutputData[index])) {
 					tmp_addr = '<i class="icon fa-bullseye"></i> <span class="label label-dark">' + _lang[defaultLang].DASHBOARD.ZADDR_NOT_LISTED + '!</span>';
 				}
 				var tmp_secondsToString = secondsToString(AjaxOutputData[index].time);
diff --git a/assets/scripts/kmd_wallet/KMDWalletDashboard.js b/assets/scripts/kmd_wallet/KMDWalletDashboard.js
index 12a6f5b..1e96fac 100644
--- a/assets/scripts/kmd_wallet/KMDWalletDashboard.js
+++ b/assets/scripts/kmd_wallet/KMDWalletDashboard.js
@@ -89,7 +89,7 @@ var KMDWalletDashboard = function() {
 		});
 
 		$('.showkmdwalletaddrs').on('change', function(){
-			var selected = $(this).find("option:selected").val();
+			var selected = $(this).find('option:selected').val();
 		});
 
 		$('#kmd_wallet_amount').keyup(function() {
diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js
index f1788dd..71d06e2 100644
--- a/assets/scripts/kmd_wallet_dashboard.js
+++ b/assets/scripts/kmd_wallet_dashboard.js
@@ -19,7 +19,7 @@ jQuery(document).ready(function() {
 			clearInterval(RefreshEdexWalletDashboard);
 			//console.log('=> No wallet logged in, or Dashboard not ative. No need to Run History.');
 		} else if ( sessionStorage.getItem('NativeWalletActions') === null || sessionStorage.getItem('NativeWalletActions') === 'start') {
-			if ( $('[data-data-extcoin]').attr("data-data-extcoin") !== 'COIN' ) {
+			if ( $('[data-data-extcoin]').attr('data-data-extcoin') !== 'COIN' ) {
 				if ( sessionStorage.getItem('edexTmpMode') !== null || sessionStorage.getItem('edexTmpMode') === 'Native') {
 					if ( sessionStorage.getItem('edexTmpRefresh') === null || sessionStorage.getItem('edexTmpRefresh') === 'start') {
 						//console.log('it is not COIN. '+'It is: ' + $('[data-data-extcoin]').attr("data-data-extcoin"));
diff --git a/assets/scripts/login.js b/assets/scripts/login.js
index 7193e82..d8dee86 100644
--- a/assets/scripts/login.js
+++ b/assets/scripts/login.js
@@ -502,7 +502,7 @@ var Login = function() {
                   .addClass( 'page-login layout-full page-dark' );
                 $('#wallet-core').hide();
                 $('link[id=loginStyle]')[0].disabled = false;
-                $("#loginbtn").text(_lang[defaultLang].LOGIN.UNLOCK);
+                $('#loginbtn').text(_lang[defaultLang].LOGIN.UNLOCK);
                 // Hide some login fields not needing at lock screen
                 console.log('Wallet is Locked.');
                 $('#login-welcome').text(_lang[defaultLang].LOGIN.WALLET_LOCKED_LOGIN);