diff --git a/config.js b/config.js
index 79636ff..63c5a4d 100644
--- a/config.js
+++ b/config.js
@@ -4,9 +4,6 @@ export const DISPLAY_CURSOR_INFO = false;
 export const DISPLAY_CANVAS_SIZE = false;
 export const DISPLAY_CURRENT_SCALE = false;
 export const DISPLAY_CURRENT_MODE = false;
-export const DISPLAY_VELOCITY_VECTORS = true;
-export const DISPLAY_ACCELERATION_VECTORS = true;
-export const DISPLAY_PATH_TRACES = false;
 
 // VELOCITY
 export const VELOCITY_VECTOR_SCALE = 8E0;
@@ -24,16 +21,11 @@ export const ACCELERATION_VECTOR_ARROWHEAD = true;
 export const PATH_TRACES_COLOR = 'object color';
 export const PATH_TRACES_OPACITY = 0.8;
 export const PATH_TRACES_WIDTH = 1.5;
-export const PATH_TRACES_DASHED = false;
 export const PATH_TRACES_DASHED_OPACITY = 1.0;
 
-// SCALING FACTORS
-export const MASS_CREATION_RATE = 10;
-export const POINTER_HISTORY_SIZE = 20;
-export const MOTION_TIME_SCALE = 0.3;
-export const GRAVITATIONAL_CONSTANT = 2E4;
-
 // SIZES
+export const POINTER_HISTORY_SIZE = 20;
+export const POINTER_DOWN_HISTORY_SIZE = 5;
 export const ARROWHEAD_LENGTH = 7;
 export const ARROWHEAD_WIDTH = 5;
 export const OFFSCREEN_OBJECT_LINE_SCALE = 7;
@@ -62,8 +54,3 @@ export const EVENT_OPTION_SET = 'lhg-option-set';
 export const MODE_MASS_GENERATION = 'mass-gen';
 export const MODE_PAN_VIEW = 'pan-view';
 export const MODE_OBJECT_SELECT = 'select';
-
-// OPTIONS
-export const PAUSE_DURING_CREATION = true;
-export const PAUSE_DURING_SELECTION = true;
-export const MERGE_ON_COLLIDE = true;
diff --git a/options.js b/options.js
index 24625dd..6dab240 100644
--- a/options.js
+++ b/options.js
@@ -1,35 +1,25 @@
 import {
-  DISPLAY_ACCELERATION_VECTORS,
-  DISPLAY_VELOCITY_VECTORS,
-  GRAVITATIONAL_CONSTANT,
-  MASS_CREATION_RATE,
-  MERGE_ON_COLLIDE,
-  MOTION_TIME_SCALE,
-  PATH_TRACES_DASHED,
-  PAUSE_DURING_CREATION,
-  PAUSE_DURING_SELECTION,
   EVENT_OPTION_SET,
 } from './config.js';
 
 export const optionsLayout = {
   pauseDuring: {
-    creation: ['Pause While Creating', 'boolean', PAUSE_DURING_CREATION],
-    creation2: ['Pause While Creating', 'boolean', PAUSE_DURING_CREATION],
-    selection: ['Pause While Selecting', 'boolean', PAUSE_DURING_SELECTION],
+    creation: ['Pause While Creating', 'boolean', true],
+    selection: ['Pause While Selecting', 'boolean', true],
   }, 
   display: {
-    velocity: ['Velocity Vectors', 'boolean', DISPLAY_VELOCITY_VECTORS],
-    acceleration: ['Accel. Vectors', 'boolean', DISPLAY_ACCELERATION_VECTORS],
-    traces: ['Path Traces', 'boolean', DISPLAY_ACCELERATION_VECTORS],
-    dashedTraces: ['Dashed Traces', 'boolean', PATH_TRACES_DASHED],
+    velocity: ['Velocity Vectors', 'boolean', true],
+    acceleration: ['Accel. Vectors', 'boolean', true],
+    traces: ['Path Traces', 'boolean', true],
+    dashedTraces: ['Dashed Traces', 'boolean', false],
   },
   collision: {
-    merge: ['Merge Masses<br>on Collision', 'boolean', MERGE_ON_COLLIDE, {wide: true}],
+    merge: ['Merge Masses<br>on Collision', 'boolean', true, {wide: true}],
   },
   param: {
-    gravity: ['Gravity', 'number', GRAVITATIONAL_CONSTANT],
-    timeScale: ['Time Scale', 'number', MOTION_TIME_SCALE],
-    massCreationRate: ['Mass Creation Rate', 'number', MASS_CREATION_RATE],
+    gravity: ['Gravity', 'number', 5E4],
+    timeScale: ['Time Scale', 'number', 0.3],
+    massCreationRate: ['Mass Creation Rate', 'number', 10],
   }
 };
 
diff --git a/pointer.js b/pointer.js
index 98e17dd..9c5a4d6 100644
--- a/pointer.js
+++ b/pointer.js
@@ -4,6 +4,7 @@ import {
   MODE_OBJECT_SELECT,
   MODE_PAN_VIEW,
   POINTER_HISTORY_SIZE,
+  POINTER_DOWN_HISTORY_SIZE,
   TOOLBAR_CLASSNAME,
   ZOOM_IN_FACTOR,
   ZOOM_OUT_FACTOR,
@@ -89,7 +90,7 @@ export class Pointer {
   }
 
   handlePointerDown({x: clientX, y: clientY}) {
-    this.clearPointerHistory(5);
+    this.clearPointerHistory(POINTER_DOWN_HISTORY_SIZE);
     this.updatePointer({x: clientX, y: clientY});
 
     if (this.sim.isCurrentMode(MODE_MASS_GENERATION)) {