diff --git a/lib/network/Network.js b/lib/network/Network.js
index 3a902624..fe20f735 100644
--- a/lib/network/Network.js
+++ b/lib/network/Network.js
@@ -187,7 +187,6 @@ function Network (container, data, options) {
       type: "continuous",
       roundness: 0.5
     },
-    dynamicSmoothCurves: true,
     maxVelocity:  30,
     minVelocity:  0.1,   // px/s
     stabilize: true,  // stabilize before displaying the network
@@ -569,9 +568,10 @@ Network.prototype.setOptions = function (options) {
   if (options) {
     var prop;
 
-    var fields = ['nodes','edges','smoothCurves','hierarchicalLayout','clustering','navigation','keyboard','dataManipulation',
-      'onAdd','onEdit','onEditEdge','onConnect','onDelete','clickToUse'
+    var fields = ['nodes','edges','smoothCurves','hierarchicalLayout','clustering','navigation',
+      'keyboard','dataManipulation','onAdd','onEdit','onEditEdge','onConnect','onDelete','clickToUse'
     ];
+    // extend all but the values in fields
     util.selectiveNotDeepExtend(fields,this.constants, options);
     util.selectiveNotDeepExtend(['color'],this.constants.nodes, options.nodes);
     util.selectiveNotDeepExtend(['color','length'],this.constants.edges, options.edges);
diff --git a/lib/timeline/Range.js b/lib/timeline/Range.js
index a2e74c67..40157a0f 100644
--- a/lib/timeline/Range.js
+++ b/lib/timeline/Range.js
@@ -285,8 +285,8 @@ Range.prototype._applyRange = function(start, end) {
   var changed = (this.start != newStart || this.end != newEnd);
 
   // if the new range does NOT overlap with the old range, emit checkRangedItems to avoid not showing ranged items (ranged meaning has end time, not neccesarily of type Range)
-  if (!((newStart >= this.start && newStart   <= this.start) || (newEnd   >= this.start && newEnd   <= this.end)) &&
-      !((this.start >= newStart && this.start <= newEnd)     || (this.end >= newStart   && this.end <= newEnd) )) {
+  if (!((newStart >= this.start && newStart   <= this.end) || (newEnd   >= this.start && newEnd   <= this.end)) &&
+      !((this.start >= newStart && this.start <= newEnd)   || (this.end >= newStart   && this.end <= newEnd) )) {
     this.body.emitter.emit('checkRangedItems');
   }