diff --git a/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json b/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json
index d9dd2c17fd..c0457dec6d 100644
--- a/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json
+++ b/scripts/tutorials/entity_scripts/balloonSpawner/balloonParty.json
@@ -13,7 +13,7 @@
             "shape": "Cube",
             "visible": "false",
             "collisionless": "true",
-            "userData": "{\"spawnRate\":1000,\"xRangeMax\":1,\"zRangeMax\":1,\"gravityCoefficient\":0.25,\"balloonLifetime\":10,\"spawnTime\":300,\"spawnMusicURL\":\"http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Audio/Blue_Skies.wav\",\"spawnMusicVolume\":0.1}"
+            "userData": "{\"spawnRate\":1000,\"xRangeMax\":1,\"zRangeMax\":1,\"gravityCoefficient\":0.25,\"balloonLifetime\":10,\"spawnDuration\":300,\"spawnMusicURL\":\"http://mpassets.highfidelity.com/8410ef73-9506-4dc7-b364-0174998a859e-v1/Audio/Blue_Skies.wav\",\"spawnMusicVolume\":0.1}"
         }
     ],
     "Version": 63
diff --git a/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js b/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js
index 077a4c2015..229d44209c 100644
--- a/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js
+++ b/scripts/tutorials/entity_scripts/balloonSpawner/spawnBalloons.js
@@ -28,12 +28,13 @@
     var NUM_COLORS = 7;
     var COUNTDOWN_SECONDS = 9;
 
+    var _this = this;
     var spawnRate = 2000;
     var xRangeMax = 1;
     var zRangeMax = 1;
     var gravityCoefficient = 0.25;
     var balloonLifetime = 10;
-    var spawnTime = 300;
+    var spawnDuration = 300;
     var musicInjector;
     var spawnIntervalID;
     var spawnMusic;
@@ -41,7 +42,7 @@
     var countdownEntityID;
     
 
-    this.preload = function(pEntityID) {
+    _this.preload = function(pEntityID) {
         var parentProperties = Entities.getEntityProperties(pEntityID, ["userData"]),
             spawnMusicURL,
             spawnerSettings;
@@ -51,10 +52,10 @@
         spawnMusicURL = spawnerSettings.spawnMusicURL ? spawnerSettings.spawnMusicURL : SPAWN_MUSIC_URL;
         spawnMusic = SoundCache.getSound(spawnMusicURL);
 
-        startCountdown(pEntityID);
+        _this.startCountdown(pEntityID);
     };
 
-    function startCountdown(pEntityID) {
+    _this.startCountdown = function(pEntityID) {
         var countdownSeconds = COUNTDOWN_SECONDS,
             parentProperties = Entities.getEntityProperties(pEntityID, ["position"]),
             countdownEntityProperties;
@@ -91,13 +92,13 @@
             } else {
                 Entities.editEntity(countdownEntityID, {"text": countdownSeconds});
                 if (countdownSeconds === 0) {
-                    spawnBalloons(pEntityID);
+                    _this.spawnBalloons(pEntityID);
                 }
             }
         }, 1000);
-    }
+    };
 
-    function spawnBalloons(pEntityID) {
+    _this.spawnBalloons = function(pEntityID) {
         var parentProperties = Entities.getEntityProperties(pEntityID, ["position", "userData"]),
             spawnerSettings,
             spawnMusicVolume,
@@ -110,11 +111,16 @@
         xRangeMax = !isNaN(spawnerSettings.xRangeMax) ? spawnerSettings.xRangeMax : xRangeMax;
         zRangeMax = !isNaN(spawnerSettings.zRangeMax) ? spawnerSettings.zRangeMax : zRangeMax;
         gravityCoefficient = !isNaN(spawnerSettings.gravityCoefficient) ? spawnerSettings.gravityCoefficient : gravityCoefficient;
-        spawnTime = !isNaN(spawnerSettings.spawnTime) ? spawnerSettings.spawnTime : spawnTime;
+        spawnDuration = !isNaN(spawnerSettings.spawnDuration) ? spawnerSettings.spawnDuration : spawnDuration;
         balloonLifetime = !isNaN(spawnerSettings.balloonLifetime) ? spawnerSettings.balloonLifetime : balloonLifetime;
         spawnRate =  !isNaN(spawnerSettings.spawnRate) ? spawnerSettings.spawnRate : spawnRate;
         spawnMusicVolume = !isNaN(spawnerSettings.spawnMusicVolume) ? spawnerSettings.spawnMusicVolume : 0.1;
-        
+
+        if (spawnRate < 10){
+            spawnRate = 10;
+            print("The lowest balloon spawn rate allowed is 10.");
+        }
+
         if (spawnMusic.downloaded){
             musicInjector = Audio.playSound(spawnMusic, {
                 position: parentProperties.position,
@@ -183,18 +189,18 @@
             };
             Entities.addEntity(balloonProperties);
 
-            //Stop spawning after spawnTime
-            if (spawnCount * spawnRate / 1000 > spawnTime){
-                Script.clearInterval(spawnIntervalID);
-                 if (musicInjector !== undefined && musicInjector.isPlaying) {
-                    musicInjector.stop();
-                    musicInjector = undefined;
-                }	
+            //Clean up after spawnDuration
+            if (spawnCount * spawnRate / 1000 > spawnDuration){
+                _this.cleanUp(pEntityID);
             }
          }, spawnRate);
-    }	
+    };    	
 
-    this.unload = function(){
+    _this.unload = function(){
+        _this.cleanUp();
+    };
+
+    _this.cleanUp = function(pEntityID) {
         if (spawnIntervalID){
             Script.clearInterval(spawnIntervalID);
         }
@@ -203,11 +209,14 @@
         }
         if (countdownEntityID){
             Entities.deleteEntity(countdownEntityID);
-        }
+        }        
         if (musicInjector !== undefined && musicInjector.isPlaying) {
             musicInjector.stop();
             musicInjector = undefined;
-        }		
+        }
+        if (pEntityID){
+            Entities.deleteEntity(pEntityID);
+        }	
     };
     
 });