3 files changed, 3 insertions, 6 deletions

diff --git a/js/controllers/selection-controller.js b/js/controllers/selection-controller.js
index 154fb7f8..195eea6c 100755
--- a/js/controllers/selection-controller.js
+++ b/js/controllers/selection-controller.js
@@ -90,7 +90,7 @@ exports.SelectionController = Montage.create(Component, {
         }
     },
 
-    handleSwitchDocument: {
+     handleSwitchDocument: {
         value: function() {
             if(this.application.ninja.documentController.activeDocument.currentView === "design"){
                 this._selectedItems = this.application.ninja.selectedElements.slice(0);
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 1afb9e5a..1875c740 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -859,7 +859,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
                     this.currentLayerSelected.layerData.elementsList.splice(length, 1);
                     break;
                 }
-                length--;
+                //length--;
             }
         }
     },
diff --git a/js/panels/Timeline/Tween.reel/Tween.js b/js/panels/Timeline/Tween.reel/Tween.js
index 77c0dfa8..2b308d9a 100644
--- a/js/panels/Timeline/Tween.reel/Tween.js
+++ b/js/panels/Timeline/Tween.reel/Tween.js
@@ -44,7 +44,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set: function(value){
             this._spanWidth = value;
-            this.needsDraw = true;
         }
     },
 
@@ -59,7 +58,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._spanPosition = value;
-            this.needsDraw = true;
         }
     },
 
@@ -74,7 +72,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._keyFramePosition = value;
-            this.needsDraw = true;
         }
     },
 
@@ -133,7 +130,6 @@ var Tween = exports.Tween = Montage.create(Component, {
         },
         set:function (value) {
             this._isTweenAnimated = value;
-            this.needsDraw = true;
         }
     },
 
@@ -157,6 +153,7 @@ var Tween = exports.Tween = Montage.create(Component, {
             this.tweenID = this.tweenData.tweenID;
             this.tweenedProperties = this.tweenData.tweenedProperties;
             this.isTweenAnimated = this.tweenData.isTweenAnimated;
+            this.needsDraw = true;
         }
     },