diff --git a/pluginTester/index.html b/pluginTester/index.html
index f438af3c..69081077 100644
--- a/pluginTester/index.html
+++ b/pluginTester/index.html
@@ -16,7 +16,7 @@
     <link href="../styles/loading.css" rel="stylesheet">
     <link href="../styles/helper.css" rel="stylesheet">
     <link href="../styles/siteIcons.css" rel="stylesheet">
-    <link href="http://app.buildfire.com/styles/siteScreen.css" rel="stylesheet">
+    <link href="https://app.buildfire.com/styles/siteScreen.css" rel="stylesheet">
 
     <link href="styles/pulldown.css" rel="stylesheet">
 
@@ -65,7 +65,7 @@
                 </a>
             </li>
             <li>
-                <a ng-href="http://dev.buildfire.com" target="_blank"
+                <a ng-href="https://dev.buildfire.com" target="_blank"
                    class="parent primary-color-hover transition-third">
                     <p class="text margin-zero ellipsis transition-third">Submit Plugin</p>
                     <span class="icon icon-check-square transition-third"></span>
@@ -79,7 +79,7 @@
             </li>
             <li>
                 <a target="_blank" class="parent primary-color-hover transition-third"
-                   href="http://app.buildfire.com">
+                   href="https://app.buildfire.com">
                     <p class="text margin-zero ellipsis transition-third">Control Panel</p>
                     <span class="icon icon-window transition-third"></span>
                 </a>
@@ -182,6 +182,6 @@
 <script type="text/javascript" src="scripts/pullDownToRefresh.js"></script>
 
 
-<link href="http://app.buildfire.com/styles/bootstrapIcons.css" rel="stylesheet">
+<link href="https://app.buildfire.com/styles/bootstrapIcons.css" rel="stylesheet">
 </body>
 </html>
\ No newline at end of file
diff --git a/pluginTester/pages/controllers/indexCtrl.js b/pluginTester/pages/controllers/indexCtrl.js
index c200fb3d..41f6d05c 100644
--- a/pluginTester/pages/controllers/indexCtrl.js
+++ b/pluginTester/pages/controllers/indexCtrl.js
@@ -20,7 +20,7 @@ $app.controller('indexCtrl', ['$scope', function ($scope) {
     $scope.recentPlugins = recentPlugins;
 
 
-    $scope.dataTracer = "http://dev.buildfire.com/#/dataTracer/" + window.appContext.currentApp.appId
+    $scope.dataTracer = "https://dev.buildfire.com/#/dataTracer/" + window.appContext.currentApp.appId
         + "/" + window.appContext.currentPlugin.pluginPath
         + "/" + window.appContext.currentPlugin.instanceId
         + "/" + window.appContext.currentApp.keys.datastoreKey;
diff --git a/pluginTester/pages/controllers/loginCtrl.js b/pluginTester/pages/controllers/loginCtrl.js
index 4c0f4a4f..6e49e2d2 100644
--- a/pluginTester/pages/controllers/loginCtrl.js
+++ b/pluginTester/pages/controllers/loginCtrl.js
@@ -7,7 +7,7 @@
 			if ($scope.validate()) {
 				$scope.loggingIn = true;
 
-				$http.post('http://app.buildfire.com/api/login/controlPanel/', {
+				$http.post('https://app.buildfire.com/api/login/controlPanel/', {
 					email: $scope.username,
 					password: $scope.password
 				}, {bypassInterceptorForStatus: 404})
diff --git a/pluginTester/pages/templates/login.html b/pluginTester/pages/templates/login.html
index ff9a6eaf..4e434801 100644
--- a/pluginTester/pages/templates/login.html
+++ b/pluginTester/pages/templates/login.html
@@ -55,7 +55,7 @@
             </button>
         </div>
         <div class="bottom">
-            <a href="http://app.buildfire.com/pages/forgotPassword.html" class="access">I can't access my account.</a>
+            <a href="https://app.buildfire.com/pages/forgotPassword.html" class="access">I can't access my account.</a>
         </div>
     </form>
 </div>
\ No newline at end of file
diff --git a/pluginTester/scripts/loadScripts.js b/pluginTester/scripts/loadScripts.js
index b09aeb58..dd3943d7 100644
--- a/pluginTester/scripts/loadScripts.js
+++ b/pluginTester/scripts/loadScripts.js
@@ -1,5 +1,5 @@
 function _ScriptLoader(){
-    this.domain="http://app.buildfire.com/";
+    this.domain="https://app.buildfire.com/";
     window._appRoot = 'app/';
 
     this.scripts = [
diff --git a/pluginTester/scripts/siteConfig.js b/pluginTester/scripts/siteConfig.js
index cdac3ac6..98b46098 100644
--- a/pluginTester/scripts/siteConfig.js
+++ b/pluginTester/scripts/siteConfig.js
@@ -1,12 +1,12 @@
 window.siteConfig = {
 	appId: 202
 	, endPoints: {
-		datastoreHost: 'http://datastore.buildfire.com',
+		datastoreHost: 'https://datastore.buildfire.com',
 		appHost: 'https://app.buildfire.com',
 		auth: "auth.buildfire.com",
-		authHost: "http://auth.buildfire.com",
+		authHost: "https://auth.buildfire.com",
 		pluginHost : "http://s3-us-west-2.amazonaws.com/pluginserver.prod/plugins",
-        socialHost : "http://social.buildfire.com"
+        socialHost : "https://social.buildfire.com"
 	}
 	, keys: {
 		datastoreKey: '123-ASD-TEST'
diff --git a/scripts/buildfire.js b/scripts/buildfire.js
index fb938af1..3d4b2b77 100644
--- a/scripts/buildfire.js
+++ b/scripts/buildfire.js
@@ -179,14 +179,14 @@ var buildfire = {
             //alert('parent sent: ' + packet.data);
         }
     }
-    , _resendAttempts:0
+    //, _resendAttempts:0
     , _sendPacket: function (packet, callback) {
         if (typeof (callback) != "function")// handels better on response
             callback = function (err, result) {
                 //console.info('buildfire.js ignored callback ' + JSON.stringify(arguments));
             };
         
-        var retryInterval = 1000,
+        var retryInterval = 1500,
             command = packet.cmd,
             maxResendAttempts = 15,
             resendAttempts = 0;
@@ -205,7 +205,7 @@ var buildfire = {
 
         var resend = function(){
             if(resendAttempts < maxResendAttempts) {
-                console.log("calling " + packet.cmd + ' again. total overall resend attempts ' + resendAttempts);
+                console.error("calling " + packet.cmd + ' again. total overall resend attempts ' + resendAttempts);
                 buildfire._sendPacket(packet, function (e, d) {
                     resendAttempts--;
                     callback(e, d);
@@ -269,6 +269,9 @@ var buildfire = {
          */
         navigateTo: function (pluginData) {
 
+            if(pluginData.pluginTypeId && !pluginData.pluginId)
+                pluginData.pluginId=pluginData.pluginTypeId;
+
             if (pluginData.pluginId
                 && pluginData.instanceId
                 && pluginData.folderName) {