diff --git a/development_server.js b/development_server.js
index be5800c2e..d14bd6af1 100644
--- a/development_server.js
+++ b/development_server.js
@@ -22,7 +22,7 @@ if (process.argv[2] === 'develop') {
     });
 
     http.createServer(
-        ecstatic({ root: __dirname })
+        ecstatic({ root: __dirname, cache: 0 })
     ).listen(8080);
 
     console.log('Listening on :8080');
diff --git a/modules/behavior/drag.js b/modules/behavior/drag.js
index a43e8d129..6df644134 100644
--- a/modules/behavior/drag.js
+++ b/modules/behavior/drag.js
@@ -32,15 +32,8 @@ export function drag() {
 
     function eventOf(thiz, argumentz) {
       return function(e1) {
-        var e0 = e1.sourceEvent = d3.event;
         e1.target = drag;
-        // TODO
-        // d3.event = e1;
-        try {
-          event[e1.type].apply(thiz, argumentz);
-        } finally {
-          // d3.event = e0;
-        }
+        d3.customEvent(e1, event.apply, event, [e1.type, thiz, argumentz]);
       };
     };
 
diff --git a/modules/behavior/draw.js b/modules/behavior/draw.js
index 32d97aa09..f07620b84 100644
--- a/modules/behavior/draw.js
+++ b/modules/behavior/draw.js
@@ -90,7 +90,7 @@ export function Draw(context) {
     function click() {
         var d = datum();
         if (d.type === 'way') {
-            var dims = getDimensions(context.map()),
+            var dims = context.map().dimensions(),
                 mouse = context.mouse(),
                 pad = 5,
                 trySnap = mouse[0] > pad && mouse[0] < dims[0] - pad &&
diff --git a/modules/behavior/draw_way.js b/modules/behavior/draw_way.js
index 7d81910a7..7f71791ef 100644
--- a/modules/behavior/draw_way.js
+++ b/modules/behavior/draw_way.js
@@ -42,7 +42,7 @@ export function DrawWay(context, wayId, index, mode, baseGraph) {
             loc = datum.loc;
 
         } else if (datum.type === 'way' && datum.id !== segment.id) {
-            var dims = getDimensions(context.map()),
+            var dims = context.map().dimensions(),
                 mouse = context.mouse(),
                 pad = 5,
                 trySnap = mouse[0] > pad && mouse[0] < dims[0] - pad &&
diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index fbe35339a..15c0be3e0 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -106,7 +106,7 @@ export function DragNode(context) {
 
         var nudge = childOf(context.container().node(),
             d3.event.sourceEvent.toElement) &&
-            edge(d3.event.point, getDimensions(context.map()));
+            edge(d3.event.point, context.map().dimensions());
 
         if (nudge) startNudge(nudge);
         else stopNudge();
diff --git a/modules/modes/move.js b/modules/modes/move.js
index 33747ee2e..6b2d6fecc 100644
--- a/modules/modes/move.js
+++ b/modules/modes/move.js
@@ -60,7 +60,7 @@ export function Move(context, entityIDs, baseGraph) {
 
         context.overwrite(action, annotation);
 
-        var nudge = edge(currMouse, getDimensions(context.map()));
+        var nudge = edge(currMouse, context.map().dimensions());
         if (nudge) startNudge(nudge);
         else stopNudge();
     }