diff --git a/examples/cache1.html b/examples/cache1.html
index 6a4fbdc..660c33b 100644
--- a/examples/cache1.html
+++ b/examples/cache1.html
@@ -12,7 +12,8 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
+
     <script type="text/javascript">
 
       var loaded,
diff --git a/examples/cache2.html b/examples/cache2.html
index 793b30c..798af82 100644
--- a/examples/cache2.html
+++ b/examples/cache2.html
@@ -12,7 +12,7 @@
 You will need to enable Javascript to run this demo.
 </noscript>
 
-<script src="meta2d.js"></script>
+<script src="../meta2d.js"></script>
 <script>
 
 // In this demonstration, we want to draw some entities outside of the screen
diff --git a/examples/drawing.html b/examples/drawing.html
index 32ffdf0..322c3b9 100644
--- a/examples/drawing.html
+++ b/examples/drawing.html
@@ -12,7 +12,7 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
 
diff --git a/examples/entity.html b/examples/entity.html
index 4a768f4..dbdedb3 100644
--- a/examples/entity.html
+++ b/examples/entity.html
@@ -12,7 +12,7 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
 
diff --git a/examples/layer.html b/examples/layer.html
index de0c0e7..ba6f337 100644
--- a/examples/layer.html
+++ b/examples/layer.html
@@ -12,7 +12,7 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
 
diff --git a/examples/mouse.html b/examples/mouse.html
index dd356cf..837ad87 100644
--- a/examples/mouse.html
+++ b/examples/mouse.html
@@ -12,7 +12,7 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
 
diff --git a/examples/text.html b/examples/text.html
index 934c3c8..dc76147 100644
--- a/examples/text.html
+++ b/examples/text.html
@@ -11,9 +11,10 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
+
       document.addEventListener('DOMContentLoaded', function() {
 
         var mcx = meta2d.create('demo', {
diff --git a/examples/ui.html b/examples/ui.html
index ea45d9e..72508eb 100644
--- a/examples/ui.html
+++ b/examples/ui.html
@@ -12,7 +12,7 @@
       You will need to enable Javascript to run this demo.
     </noscript>
 
-    <script type="text/javascript" src="meta2d.js"></script>
+    <script type="text/javascript" src="../meta2d.js"></script>
 
     <script type="text/javascript">
 
diff --git a/rakefile b/rakefile
index 8dc20d3..5e67d29 100644
--- a/rakefile
+++ b/rakefile
@@ -2,14 +2,13 @@
 #
 # Instructions:
 #
-#   (1) Install rake build system.
+#   (1) Install rake build utility.
 #
-#   (2) Run 'rake' to generate the following:
-#       ++ /meta2d.js
-#       ++ /docs/api/index.html
+#   (2) Run 'rake' to generate the following files:
+#       ++ meta2d.js
+#       ++ docs/api/index.html
 #
-#   (3) Run 'rake clean':
-#       -- Removes generated files.
+#   (3) Run 'rake clean' to remove all generated files.
 
 directory "docs/api"
 
@@ -29,7 +28,6 @@ sourcefiles = [
   "src/layer.js",
   "src/lru.js",
   "src/metacontext.js",
-  "src/process.js",
   "src/projection.js",
   "src/rcache.js",
   "src/rtree.js",
@@ -68,4 +66,5 @@ end
 
 desc "Generate Javascript library, build documentation."
 task :default => [:merge, :document] do
+  puts "All done."
 end
diff --git a/src/animation.js b/src/animation.js
index 138873a..b1b904d 100644
--- a/src/animation.js
+++ b/src/animation.js
@@ -1,7 +1,7 @@
-/* ----------------------------------------------------------------------------
- * https://gitorious.org/meta2d/core/trees/master/
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
  * src/animation.js
- * ----------------------------------------------------------------------------
+ * -----------------------------------------------------------------------------
  * Copyright 2011 Michael Morris-Pearce
  * 
  * This file is part of Meta2D.
@@ -20,12 +20,9 @@
  * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
 
-!function(root) {
+!function(meta) {
 
-  'use strict';
-
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+  'use strict'
 
   /**
    * @class Animation
@@ -59,20 +56,20 @@
   var Animation = function() {
     var frames_ = {},
         tweens_ = [],
-        data_ = {};
+        data_ = {}
 
     // take a base frame and apply tweens on top of it
     var apply_tweens = function(frame, tweens, index) {
-      if (!tweens || meta.undef(index)) return frame;
-      var merged = meta.mix({}, frame);
+      if (!tweens || meta.undef(index)) return frame
+      var merged = meta.mix({}, frame)
 
       tweens.forEach(function(t) {
-          var f = t.tween.call(this, index);
-          meta.mix(merged, f);
-          }, this);
+          var f = t.tween.call(this, index)
+          meta.mix(merged, f)
+          }, this)
 
-      return merged;
-    };
+      return merged
+    }
 
     /**
      * @method putFrame
@@ -93,12 +90,12 @@
      *  thisArg
      */
     this.putFrame = function(index, data) {
-      if (meta.undef(index) || !data) return this;
+      if (meta.undef(index) || !data) return this
      
-      frames_[index] = meta.declareSafely(frames_[index], data);
+      frames_[index] = meta.declareSafely(frames_[index], data)
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method getFrame
@@ -118,14 +115,14 @@
      * @return Object
      */
     this.getFrame = function(index) {
-      if (meta.undef(index)) return null;
+      if (meta.undef(index)) return null
       var f = frames_[index] || {},
           intersecting_tweens = tweens_.filter(function(t) {
-              return meta.segment.includes(t.segment, index);
-              });
+              return meta.segment.includes(t.segment, index)
+              })
 
-      return apply_tweens(f, intersecting_tweens, index);
-    };
+      return apply_tweens(f, intersecting_tweens, index)
+    }
 
     /**
      * @method deleteFrame
@@ -146,9 +143,9 @@
      *  thisArg
      */
     this.deleteFrame = function(index) {
-      delete frames_[index];
-      return this;
-    };
+      delete frames_[index]
+      return this
+    }
 
     /**
      * @method applyTween
@@ -190,26 +187,26 @@
      *  thisArg
      */
     this.applyTween = function(tween, segment) {
-      if (!segment) segment = meta.segment.ALWAYS;
-      if (!tween) throw new meta.exception.InvalidParameterException();
+      if (!segment) segment = meta.segment.ALWAYS
+      if (!tween) throw new meta.exception.InvalidParameterException()
       if (arguments.length < 4) {
         if (arguments.length < 3) {
-          arguments[2] = this.getFrame(segment[0]);
+          arguments[2] = this.getFrame(segment[0])
         }
-        arguments[3] = this.getFrame(segment[1]);
+        arguments[3] = this.getFrame(segment[1])
       }
       var keyframes = meta.args(arguments).slice(2),
-          fixed = tween.fix.bind(this, segment).apply(this, keyframes);
-      if (!fixed) return this;
-      if (segment[0] === segment[1]) return this;
+          fixed = tween.fix.bind(this, segment).apply(this, keyframes)
+      if (!fixed) return this
+      if (segment[0] === segment[1]) return this
 
       tweens_.push({
           segment: segment,
           tween: fixed
-          });
+          })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method undoTweens
@@ -233,19 +230,19 @@
      * thisArg
      */
     this.undoTweens = function(segment) {
-      if (!segment) return this;
+      if (!segment) return this
 
       tweens_.forEach(function(t, i, array) {
           if (meta.segment.intersects(t.segment, segment))
-            delete array[i];
-          });
+            delete array[i]
+          })
 
-      return this;
-    };
-  };
+      return this
+    }
+  }
 
   meta.mixSafely(meta, {
     Animation: Animation
-  });
+  })
 
-}(this);
+}(this.meta2d);
diff --git a/src/context.js b/src/context.js
index 34bbac9..ef8315e 100644
--- a/src/context.js
+++ b/src/context.js
@@ -1,33 +1,30 @@
-/** context.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/context.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this,
-      meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var CANVAS_STYLE = 'position: absolute; left:0px; top:0px;';
+  var CANVAS_STYLE = 'position: absolute left:0px top:0px'
 
   /**
    * @class Context
@@ -57,12 +54,12 @@
   /**
    * @constructor
    *  <code>
-   *  var ctx = new Context(200, 100);
-   *  ctx.scale(10, 10);
-   *  ctx.translate(10, 5);
-   *  ctx.fillRect(-10, -5, 20, 10);
+   *  var ctx = new Context(200, 100)
+   *  ctx.scale(10, 10)
+   *  ctx.translate(10, 5)
+   *  ctx.fillRect(-10, -5, 20, 10)
    *
-   *  ctx.getTransform();  // [10, 0, 0, 10, 100, 50]
+   *  ctx.getTransform()  // [10, 0, 0, 10, 100, 50]
    *  </code>
    *
    * @param w
@@ -79,148 +76,148 @@
         canvas_ = document.createElement('canvas'),
         nativeCtx_,
         matrix_ = meta.math.affine.identity(),
-        stack_ = [matrix_];
+        stack_ = [matrix_]
 
-    canvas_.setAttribute('style', CANVAS_STYLE);
+    canvas_.setAttribute('style', CANVAS_STYLE)
 
     if (meta.undef(h) && meta.def(w)) {
       // Parse single argument as a canvas.
-      canvas_.width = w.width;
-      canvas_.height = w.height;
-      nativeCtx_ = canvas_.getContext('2d');
-      nativeCtx_.drawImage(w, 0, 0);
+      canvas_.width = w.width
+      canvas_.height = w.height
+      nativeCtx_ = canvas_.getContext('2d')
+      nativeCtx_.drawImage(w, 0, 0)
 
     } else if (!w || !h || w < 0 || h < 0) {
-      throw new meta.exception.InvalidParameterException();
+      throw new meta.exception.InvalidParameterException()
     } else {
-      canvas_.width = w;
-      canvas_.height = h;
-      nativeCtx_ = canvas_.getContext('2d');
+      canvas_.width = w
+      canvas_.height = h
+      nativeCtx_ = canvas_.getContext('2d')
     }
 
     var get = function(attribute) {
-      return nativeCtx_[attribute];
-    };
+      return nativeCtx_[attribute]
+    }
 
     var set = function(attribute, value) {
-      nativeCtx_[attribute] = value;
-    };
+      nativeCtx_[attribute] = value
+    }
 
     var do_the_right_thing = function(method) {
       var f = function() {
         return CanvasRenderingContext2D.prototype[method]
-          .apply(nativeCtx_, arguments);
-      };
-      this[method] = f.bind(this);
-    };
-
-    [ // straight-up Context2d methods.
-      'createLinearGradient',
-      'createRadialGradient',
-      'createPattern',
-      'clearRect',
-      'fillRect',
-      'strokeRect',
-      'beginPath',
-      'closePath',
-      'moveTo',
-      'lineTo',
-      'quadraticCurveTo',
-      'arcTo',
-      'rect',
-      'arc',
-      'fill',
-      'stroke',
-      'clip',
-      'isPointInPath',
-      'drawFocusRing',
-      'caretBlinkRate',
-      'setCaretSelectionRect',
-      'fillText',
-      'strokeText',
-      'measureText',
-      'drawImage',
-      'createImageData',
-      'getImageData',
-      'putImageData'
-    ].forEach(do_the_right_thing, this);
+          .apply(nativeCtx_, arguments)
+      }
+      this[method] = f.bind(this)
+    }
+
+    // straight-up Context2d methods.
+    ;['createLinearGradient'
+    , 'createRadialGradient'
+    , 'createPattern'
+    , 'clearRect'
+    , 'fillRect'
+    , 'strokeRect'
+    , 'beginPath'
+    , 'closePath'
+    , 'moveTo'
+    , 'lineTo'
+    , 'quadraticCurveTo'
+    , 'arcTo'
+    , 'rect'
+    , 'arc'
+    , 'fill'
+    , 'stroke'
+    , 'clip'
+    , 'isPointInPath'
+    , 'drawFocusRing'
+    , 'caretBlinkRate'
+    , 'setCaretSelectionRect'
+    , 'fillText'
+    , 'strokeText'
+    , 'measureText'
+    , 'drawImage'
+    , 'createImageData'
+    , 'getImageData'
+    , 'putImageData'
+    ].forEach(do_the_right_thing, this)
 
     var do_the_other_right_thing = function(attribute) {
       Object.defineProperty(this, attribute, {
           get: get.bind(this, attribute),
           set: set.bind(this, attribute),
           enumerable: true,
-          });
-    };
-
-    [ // Context2d attributes.
-      'globalAlpha',
-      'globalCompositeOperation',
-      'strokeStyle',
-      'fillStyle',
-      'lineWidth',
-      'lineCap',
-      'lineJoin',
-      'miterLimit',
-      'shadowOffsetX',
-      'shadowOffsetY',
-      'shadowBlur',
-      'shadowColor',
-      'font',
-      'textAlign',
-      'textBaseline'
-    ].forEach(do_the_other_right_thing, this);
+          })
+    }
+
+    // Context2d attributes.
+    ;['globalAlpha'
+    , 'globalCompositeOperation'
+    , 'strokeStyle'
+    , 'fillStyle'
+    , 'lineWidth'
+    , 'lineCap'
+    , 'lineJoin'
+    , 'miterLimit'
+    , 'shadowOffsetX'
+    , 'shadowOffsetY'
+    , 'shadowBlur'
+    , 'shadowColor'
+    , 'font'
+    , 'textAlign'
+    , 'textBaseline'
+    ].forEach(do_the_other_right_thing, this)
 
     // read-only 'canvas' attribute of Context2d.
     Object.defineProperty(this, 'canvas', {
         enumerable: true,
         writable: false,
         value: canvas_
-        });
+        })
 
     this.save = function() {
-      matrix_ = matrix_.slice(0);
-      stack_.push(matrix_);
+      matrix_ = matrix_.slice(0)
+      stack_.push(matrix_)
       return CanvasRenderingContext2D.prototype.save
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.restore = function() {
-      matrix_ = stack_.pop();
-      if (stack_.length <= 0) stack_.push(matrix_);
+      matrix_ = stack_.pop()
+      if (stack_.length <= 0) stack_.push(matrix_)
       return CanvasRenderingContext2D.prototype.restore
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.scale = function(x, y) {
-      matrix_ = meta.math.affine.scale(matrix_, x, y);
+      matrix_ = meta.math.affine.scale(matrix_, x, y)
       return CanvasRenderingContext2D.prototype.scale
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.rotate = function(angle) {
-      matrix_ = meta.math.affine.rotate(matrix_, angle);
+      matrix_ = meta.math.affine.rotate(matrix_, angle)
       return CanvasRenderingContext2D.prototype.rotate
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.translate = function(x, y) {
-      matrix_ = meta.math.affine.translate(matrix_, x, y);
+      matrix_ = meta.math.affine.translate(matrix_, x, y)
       return CanvasRenderingContext2D.prototype.translate
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.transform = function(a, b, c, d, e, f) {
-      matrix_ = meta.math.affine.transform(matrix_, [a, b, c, d, e, f]);
+      matrix_ = meta.math.affine.transform(matrix_, [a, b, c, d, e, f])
       return CanvasRenderingContext2D.prototype.transform
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     this.setTransform = function(a, b, c, d, e, f) {
-      matrix_ = [a, b, c, d, e, f];
+      matrix_ = [a, b, c, d, e, f]
       return CanvasRenderingContext2D.prototype.setTransform
-        .apply(nativeCtx_, arguments);
-    };
+        .apply(nativeCtx_, arguments)
+    }
 
     /**
      * @method getTransform
@@ -236,13 +233,13 @@
      * @return Array<<Number>>[6]
      */
     this.getTransform = function() {
-      return matrix_.slice(0);
-    };
+      return matrix_.slice(0)
+    }
 
-  };
+  }
 
   meta.mixSafely(meta, {
     Context: Context
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/drawing.js b/src/drawing.js
index 008432f..0002b21 100644
--- a/src/drawing.js
+++ b/src/drawing.js
@@ -1,42 +1,39 @@
-/** drawing.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/drawing.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   var Drawing = function(){
     if (arguments[0] && arguments[1]) {
-      this.ctx = new meta.Context(arguments[0], arguments[1]);
+      this.ctx = new meta.Context(arguments[0], arguments[1])
     } else if (arguments[0]) {
-      this.ctx = arguments[0];
+      this.ctx = arguments[0]
     } else {
-      throw new meta.exception.InvalidParameterException();
+      throw new meta.exception.InvalidParameterException()
     }
-    this.transform = meta.math.affine.identity();
-  };
+    this.transform = meta.math.affine.identity()
+  }
 
   Drawing.prototype.getBounds = function() {
     var t,
@@ -44,32 +41,32 @@
         y1, y2, y3, y4,
         x1T, x2T, x3T, x4T,
         y1T, y2T, y3T, y4T,
-        top, bottom, left, right;
+        top, bottom, left, right
 
-    t = this.transform;
-    x1 = y1 = x2 = y4 = 0;
-    y2 = y3 = this.ctx.canvas.height;
-    x3 = x4 = this.ctx.canvas.width;
+    t = this.transform
+    x1 = y1 = x2 = y4 = 0
+    y2 = y3 = this.ctx.canvas.height
+    x3 = x4 = this.ctx.canvas.width
 
-    x1T = t[0] * x1 + t[2] * y1 + t[4];
-    y1T = t[1] * x1 + t[3] * y1 + t[5];
-    x2T = t[0] * x2 + t[2] * y2 + t[4];
-    y2T = t[1] * x2 + t[3] * y2 + t[5];
-    x3T = t[0] * x3 + t[2] * y3 + t[4];
-    y3T = t[1] * x3 + t[3] * y3 + t[5];
-    x4T = t[0] * x4 + t[2] * y4 + t[4];
-    y4T = t[1] * x4 + t[3] * y4 + t[5];
+    x1T = t[0] * x1 + t[2] * y1 + t[4]
+    y1T = t[1] * x1 + t[3] * y1 + t[5]
+    x2T = t[0] * x2 + t[2] * y2 + t[4]
+    y2T = t[1] * x2 + t[3] * y2 + t[5]
+    x3T = t[0] * x3 + t[2] * y3 + t[4]
+    y3T = t[1] * x3 + t[3] * y3 + t[5]
+    x4T = t[0] * x4 + t[2] * y4 + t[4]
+    y4T = t[1] * x4 + t[3] * y4 + t[5]
 
-    top = Math.min(Math.min(Math.min(y1T, y2T), y3T), y4T);
-    bottom = Math.max(Math.max(Math.max(y1T, y2T), y3T), y4T);
-    left = Math.min(Math.min(Math.min(x1T, x2T), x3T), x4T);
-    right = Math.max(Math.max(Math.max(x1T, x2T), x3T), x4T);
+    top = Math.min(Math.min(Math.min(y1T, y2T), y3T), y4T)
+    bottom = Math.max(Math.max(Math.max(y1T, y2T), y3T), y4T)
+    left = Math.min(Math.min(Math.min(x1T, x2T), x3T), x4T)
+    right = Math.max(Math.max(Math.max(x1T, x2T), x3T), x4T)
 
-    return [left, top, right - left, bottom - top];
-  };
+    return [left, top, right - left, bottom - top]
+  }
  
   meta.mixSafely(meta, {
     Drawing: Drawing
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/image.js b/src/image.js
index fd38869..0aa321e 100644
--- a/src/image.js
+++ b/src/image.js
@@ -1,31 +1,28 @@
-/** image.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/image.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   /**
    * @class Image
@@ -74,7 +71,7 @@
    *  Optional. A callback for when something goes wrong loading the image.
    */
   var Image = function(src, wait, onload, onerror) {
-    if (!src) throw new meta.exception.InvalidParameterException();
+    if (!src) throw new meta.exception.InvalidParameterException()
     var img_ = this,
         src_ = src,
         pixels_ = [],
@@ -82,32 +79,32 @@
         h_,
         dummy_ = document.createElement('img'),
         canvas_,
-        context_;
+        context_
 
     // Set the error callback.
-    dummy_.onerror = onerror;
+    dummy_.onerror = onerror
 
     // Set the callback for when the image is finished downloading.
     dummy_.onload = function() {
-      var idata, i;
-      canvas_ = document.createElement('canvas');
+      var idata, i
+      canvas_ = document.createElement('canvas')
 
       // Set some properties now that the image has been fetched.
-      canvas_.width = w_ = dummy_.width;
-      canvas_.height = h_ = dummy_.height;
-      context_ = canvas_.getContext('2d');
+      canvas_.width = w_ = dummy_.width
+      canvas_.height = h_ = dummy_.height
+      context_ = canvas_.getContext('2d')
 
       // Copy the image into our canvas.
-      context_.drawImage(dummy_, 0, 0);
+      context_.drawImage(dummy_, 0, 0)
 
       // Access the pixel data via the context.
-      idata = context_.getImageData(0, 0, w_, h_);
+      idata = context_.getImageData(0, 0, w_, h_)
 
-      i = idata.data.length;
-      while (i--) pixels_[i] = idata.data[i];
+      i = idata.data.length
+      while (i--) pixels_[i] = idata.data[i]
 
-      if (meta.def(onload)) onload.call(img_);
-    };
+      if (meta.def(onload)) onload.call(img_)
+    }
 
     /**
      * @method load
@@ -116,9 +113,9 @@
      * @return Image
      */
     this.load = function() {
-      dummy_.src = src_;
-      return this;
-    };
+      dummy_.src = src_
+      return this
+    }
 
     /**
      * @method getHTMLImage
@@ -127,8 +124,8 @@
      * @return HTMLImageElement
      */
     this.getHTMLImage = function() {
-      return dummy_;
-    };
+      return dummy_
+    }
 
     /**
      * @method getCanvas
@@ -138,8 +135,8 @@
      * @return HTMLCanvasElement
      */
     this.getCanvas = function() {
-      return canvas_;
-    };
+      return canvas_
+    }
     
     /**
      * @method getWidth
@@ -148,8 +145,8 @@
      * @return Number
      */
     this.getWidth = function() {
-      return w_;
-    };
+      return w_
+    }
 
     /**
      * @method getHeight
@@ -158,8 +155,8 @@
      * @return Number
      */
     this.getHeight = function() {
-      return h_;
-    };
+      return h_
+    }
 
     /**
      * @method getPixel
@@ -174,23 +171,23 @@
      * @return Array<<Number>>[4]
      */
     this.getPixel = function(x, y) {
-      var idx = 4 * ((y * w_) + x);
-      if (idx < 0 || idx >= pixels_.length) return null;
+      var idx = 4 * ((y * w_) + x)
+      if (idx < 0 || idx >= pixels_.length) return null
       return [
         pixels_[idx],
         pixels_[idx+1],
         pixels_[idx+2],
         pixels_[idx+3]
-      ];
-    };
+      ]
+    }
 
     // Start the download unless instructed otherwise.
-    if (!wait) this.load();
+    !wait && this.load()
 
-  };
+  }
 
   meta.mixSafely(meta, {
     Image: Image
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/layer.js b/src/layer.js
index 2413b3d..4fbdebe 100644
--- a/src/layer.js
+++ b/src/layer.js
@@ -1,41 +1,38 @@
-/** layer.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/layer.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var CANVAS_STYLE = 'position: absolute; left:0px; top:0px;';
+  var CANVAS_STYLE = 'position: absolute; left:0px; top:0px;'
 
   var mask = function(e, x, y) {
-    if (e.mask) return e.mask.overlaps(x, y);
-    if (!e.onmask) return false;
-    var m = e.onmask.call(e);
-    if (!m) return false;
-    return m.overlaps(x, y);
-  };
+    if (e.mask) return e.mask.overlaps(x, y)
+    if (!e.onmask) return false
+    var m = e.onmask.call(e)
+    if (!m) return false
+    return m.overlaps(x, y)
+  }
 
   /**
    * @class Layer
@@ -49,7 +46,7 @@
    */
   var Layer = function(mcx, options) {
     if (!options || !options.w || !options.h)
-      throw new meta.exception.InvalidParameterException();
+      throw new meta.exception.InvalidParameterException()
 
     var layer_ = this,
         entities_ = [],
@@ -59,7 +56,7 @@
         treehash_ = {},
         zorder_ = (options && options.z) || 0,
         memos_ = new meta.RCache((options && options.rblocks)),
-        ctx_;
+        ctx_
 
     // Allow entity and child entites to draw directly.
     // Return array of all drawings to render()
@@ -67,53 +64,53 @@
       var drawings = [],
           children = e.children || [],
           d,
-          font = [];
+          font = []
 
-      children = meta.zsort(children);
+      children = meta.zsort(children)
 
       // Transformations do not affect sibling entities.
-      ctx_.save();
+      ctx_.save()
 
       // Apply entity transformations.
-      if (e.pos) ctx_.translate(e.pos[0], e.pos[1]);
-      if (meta.def(e.angle)) ctx_.rotate(e.angle);
-      if (meta.def(e.zoom)) ctx_.scale(e.zoom, e.zoom);
+      if (e.pos) ctx_.translate(e.pos[0], e.pos[1])
+      if (meta.def(e.angle)) ctx_.rotate(e.angle)
+      if (meta.def(e.zoom)) ctx_.scale(e.zoom, e.zoom)
       
       // Global state properties.
-      if (meta.def(e.alpha)) ctx_.globalAlpha = e.alpha;
-      if (meta.def(e.composite)) ctx_.globalCompositeOperation = e.composite;
+      if (meta.def(e.alpha)) ctx_.globalAlpha = e.alpha
+      if (meta.def(e.composite)) ctx_.globalCompositeOperation = e.composite
 
       // Set the font.
       if (e.font) {
         font.push(e.font)
       } else {
-        if (e.fontstyle) font.push(e.fontstyle);
-        if (e.fontweight) font.push(e.fontweight);
-        if (e.fontsize) font.push(e.fontsize);
-        if (e.fontfamily) font.push(e.fontfamily);
+        if (e.fontstyle) font.push(e.fontstyle)
+        if (e.fontweight) font.push(e.fontweight)
+        if (e.fontsize) font.push(e.fontsize)
+        if (e.fontfamily) font.push(e.fontfamily)
       }
-      ctx_.font = font.join(' ');
+      ctx_.font = font.join(' ')
 
       if (e.draw) {
-        drawings.push(e.draw);
+        drawings.push(e.draw)
       } else if (e.ondraw) {
-        d = e.ondraw.call(e, ctx_, layer_);
-        if (d) drawings.push(d);
+        d = e.ondraw.call(e, ctx_, layer_)
+        if (d) drawings.push(d)
       }
 
       // Recurse on any children.
       children.forEach(function(e) {
-        drawings = drawings.concat(recursive_render(e));
-      });
+        drawings = drawings.concat(recursive_render(e))
+      })
 
-      ctx_.restore();
+      ctx_.restore()
 
       // Affect sibling position.
       if (e.parent && e.offset) {
-        ctx_.translate(e.offset[0], e.offset[1]);
+        ctx_.translate(e.offset[0], e.offset[1])
       }
 
-      return drawings;
+      return drawings
     }
 
     /**
@@ -132,29 +129,29 @@
         y || 0,
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
       var es = rtree_.search(rect).concat(entities_),
-          drawings = [];
+          drawings = []
       
       // Only start with top-level entities. Recurse to children.
-      es = es.filter(function(e) {return !e.parent;});
+      es = es.filter(function(e) {return !e.parent})
 
       // Sort by 'z' property.
-      es = meta.zsort(es);
+      es = meta.zsort(es)
 
       // Call each entity's ondraw method, allowing direct rendering onto
       // canvas, or return a drawing to use with cache.
       es.forEach(function(e) {
-          drawings = drawings.concat(recursive_render(e));
-          });
+          drawings = drawings.concat(recursive_render(e))
+          })
 
       // Draw drawings onto any memo blocks.
       drawings.forEach(function(d) {
-          layer_.draw(d);
-          });
+          layer_.draw(d)
+          })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method makeDrawing
@@ -164,15 +161,15 @@
      * @return Drawing
      */
     this.makeDrawing = function() {
-      var d = new meta.Drawing(arguments[0], arguments[1]);
+      var d = new meta.Drawing(arguments[0], arguments[1])
 
       // Copy certain properties from layer context.
-      d.ctx.globalAlpha = ctx_.globalAlpha;
-      d.ctx.globalCompositeOperation = ctx_.globalCompositeOperation;
-      d.transform = ctx_.getTransform();
+      d.ctx.globalAlpha = ctx_.globalAlpha
+      d.ctx.globalCompositeOperation = ctx_.globalCompositeOperation
+      d.transform = ctx_.getTransform()
 
-      return d;
-    };
+      return d
+    }
 
     /**
      * @method draw
@@ -181,28 +178,28 @@
      *  thisArg
      */
     this.draw = function(d) {
-      var bound = d.getBounds();
+      var bound = d.getBounds()
 
       memos_.search(bound).forEach(function(b) {
-          b.ctx.save();
+          b.ctx.save()
 
           // Draw to block-local coordinates.
-          b.ctx.translate(-b.rect[0], -b.rect[1]);
+          b.ctx.translate(-b.rect[0], -b.rect[1])
 
           // Apply the drawing's transformation.
-          b.ctx.transform.apply(b.ctx, d.transform);
+          b.ctx.transform.apply(b.ctx, d.transform)
 
           // Apply alpha.
-          b.ctx.globalAlpha = d.ctx.globalAlpha;
-          b.ctx.globalCompositeOperation = d.ctx.globalCompositeOperation;
+          b.ctx.globalAlpha = d.ctx.globalAlpha
+          b.ctx.globalCompositeOperation = d.ctx.globalCompositeOperation
 
-          b.ctx.drawImage(d.ctx.canvas, 0, 0);
+          b.ctx.drawImage(d.ctx.canvas, 0, 0)
 
-          b.ctx.restore();
-          });
+          b.ctx.restore()
+          })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method memo
@@ -221,15 +218,15 @@
         y || 0,
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
 
       memos_.add(rect, {
         ctx: new meta.Context(rect[2], rect[3]),
         rect: rect
-      });
+      })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method flip
@@ -269,29 +266,29 @@
         (y || 0) + mcx.camera()[1],
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
 
       memos_.search(rect).forEach(function(b) {
-          var itx = meta.math.rect.intersect(b.rect, rect);
-          if (!itx) return;
+          var itx = meta.math.rect.intersect(b.rect, rect)
+          if (!itx) return
 
           // Make sure flipped edges are consistent.
-          itx = itx.map(meta.floor);
+          itx = itx.map(meta.floor)
 
-          ctx_.save();
+          ctx_.save()
 
           // Ignore the transformation state in use by user.
-          ctx_.setTransform.apply(ctx_, meta.math.affine.identity());
+          ctx_.setTransform.apply(ctx_, meta.math.affine.identity())
 
           // Erase the target area.
           ctx_.clearRect(
             itx[0] - mcx.camera()[0],
             itx[1] - mcx.camera()[1],
             itx[2],
-            itx[3]);
+            itx[3])
 
           // Copy the source area.
-          ctx_.globalCompositeOperation = 'source-over';
+          ctx_.globalCompositeOperation = 'source-over'
           ctx_.drawImage(
             b.ctx.canvas,
             itx[0] - b.rect[0],
@@ -301,13 +298,13 @@
             itx[0] - mcx.camera()[0],
             itx[1] - mcx.camera()[1],
             itx[2],
-            itx[3]);
+            itx[3])
 
-          ctx_.restore();
-          });
+          ctx_.restore()
+          })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method erase
@@ -326,20 +323,20 @@
         y || 0,
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
 
       memos_.search(rect).forEach(function(b) {
-          var itx = meta.math.rect.intersect(b.rect, rect);
-          if (!itx) return;
+          var itx = meta.math.rect.intersect(b.rect, rect)
+          if (!itx) return
           b.ctx.clearRect(
             meta.round(itx[0] - b.rect[0]),
             meta.round(itx[1] - b.rect[1]),
             meta.round(itx[2]),
-            meta.round(itx[3]));
-          });
+            meta.round(itx[3]))
+          })
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method prune
@@ -354,8 +351,8 @@
      */
     this.prune = function(x, y, w, h) {
       if (arguments.length < 4) {
-        memos_ = new meta.RCache((options && options.rblocks));
-        return this;
+        memos_ = new meta.RCache((options && options.rblocks))
+        return this
       }
 
       var rect = [
@@ -363,12 +360,12 @@
         y || 0,
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
 
-      memos_.pluckInside(rect);
+      memos_.pluckInside(rect)
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method crop
@@ -387,12 +384,12 @@
         y || 0,
         w || this.getWidth(),
         h || this.getHeight()
-      ];
+      ]
 
-      memos_.pluckOutside(rect);
+      memos_.pluckOutside(rect)
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method repaint
@@ -402,31 +399,31 @@
      * @return [Layer]
      */
     this.repaint = function() {
-      var d, b;
+      var d, b
       if (arguments.length === 1) {
-        d = arguments[0].draw;
+        d = arguments[0].draw
         if (d) {
-          b = d.getBounds();
-          delete arguments[0].draw;
-          this.erase.apply(this, b);
-          this.render.apply(this, b);
-          this.flip.apply(this, b);
+          b = d.getBounds()
+          delete arguments[0].draw
+          this.erase.apply(this, b)
+          this.render.apply(this, b)
+          this.flip.apply(this, b)
         } else {
-          this.erase(0, 0, this.getWidth(), this.getHeight());
-          this.render(0, 0, this.getWidth(), this.getHeight());
-          this.flip(0, 0, this.getWidth(), this.getHeight());
+          this.erase(0, 0, this.getWidth(), this.getHeight())
+          this.render(0, 0, this.getWidth(), this.getHeight())
+          this.flip(0, 0, this.getWidth(), this.getHeight())
         }
       } else if (arguments.length === 4) {
-        this.erase.apply(this, arguments);
-        this.render.apply(this, arguments);
-        this.flip.apply(this, arguments);
+        this.erase.apply(this, arguments)
+        this.render.apply(this, arguments)
+        this.flip.apply(this, arguments)
       } else {
-        this.erase(0, 0, this.getWidth(), this.getHeight());
-        this.render(0, 0, this.getWidth(), this.getHeight());
-        this.flip(0, 0, this.getWidth(), this.getHeight());
+        this.erase(0, 0, this.getWidth(), this.getHeight())
+        this.render(0, 0, this.getWidth(), this.getHeight())
+        this.flip(0, 0, this.getWidth(), this.getHeight())
       }
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method resize
@@ -442,35 +439,35 @@
      *  thisArg
      */
     this.resize = function(w, h) {
-      var t, bitmap;
+      var t, bitmap
 
       // Remove the old canvas from the DOM.
       if (ctx_) {
-        parent_.removeChild(ctx_.canvas);
+        parent_.removeChild(ctx_.canvas)
         t = ctx_.getTransform(),
-        bitmap = ctx_.canvas;
+        bitmap = ctx_.canvas
       }
 
       // Create a new canvas & context, copying old bitmap & transform
       // if possible.
-      ctx_ = new meta.Context(w, h);
-      if (bitmap) ctx_.drawImage(bitmap, 0, 0);
-      if (t) ctx_.setTransform.apply(ctx_, t);
+      ctx_ = new meta.Context(w, h)
+      if (bitmap) ctx_.drawImage(bitmap, 0, 0)
+      if (t) ctx_.setTransform.apply(ctx_, t)
 
       // Reassert the old z-order in the new canvas style.
-      this.z(this.z());
+      this.z(this.z())
 
       // Insert new canvas into the DOM.
-      parent_.appendChild(ctx_.canvas);
-    };
+      parent_.appendChild(ctx_.canvas)
+    }
 
     /**
      * @method getContext
      * @return [Context]
      */
     this.getContext = function() {
-      return ctx_;
-    };
+      return ctx_
+    }
 
     /**
      * @method put
@@ -483,16 +480,16 @@
      *  thisArg
      */
     this.put = function(e) {
-      if (!e) throw new meta.exception.InvalidParameterException();
+      if (!e) throw new meta.exception.InvalidParameterException()
       if (e.bound) {
-        rtree_.insert(e.bound, e);
+        rtree_.insert(e.bound, e)
       } else if (e.onbound) {
-        rtree_.insert(e.onbound.call(e), e);
+        rtree_.insert(e.onbound.call(e), e)
       } else {
-        entities_.push(e);
+        entities_.push(e)
       }
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method pick
@@ -508,13 +505,13 @@
      * @return Array
      */
     this.pick = function(x, y) {
-      x += mcx.camera()[0];
-      y += mcx.camera()[1];
-      var es = rtree_.search([x, y, 1, 1]).concat(entities_);
+      x += mcx.camera()[0]
+      y += mcx.camera()[1]
+      var es = rtree_.search([x, y, 1, 1]).concat(entities_)
       var filtered = es.filter(
-          (function(e) {return mask(e, x, y);}).bind(void 0));
-      return filtered;
-    };
+          (function(e) {return mask(e, x, y)}).bind(void 0))
+      return filtered
+    }
 
     /**
      * @method parallax
@@ -523,34 +520,34 @@
      */
     this.parallax = function(p) {
       if (meta.undef(p))
-        return parallax_;
-      parallax_ = p;
-      return this;
-    };
+        return parallax_
+      parallax_ = p
+      return this
+    }
 
     /**
      * @method getRootNode
      * @return [HTMLElement]
      */
     this.getRootNode = function() {
-      return parent_;
-    };
+      return parent_
+    }
 
     /**
      * @method getHeight
      * @return [Number]
      */
     this.getHeight = function() {
-      return ctx_.canvas.height;
-    };
+      return ctx_.canvas.height
+    }
 
     /**
      * @method getWidth
      * @return [Number]
      */
     this.getWidth = function() {
-      return ctx_.canvas.width;
-    };
+      return ctx_.canvas.width
+    }
 
     /**
      * @method z
@@ -558,31 +555,31 @@
      */
     this.z = function(z) {
       if (meta.undef(z))
-        return zorder_;
+        return zorder_
 
-      zorder_ = z;
+      zorder_ = z
       ctx_.canvas.setAttribute('style',
-          CANVAS_STYLE + ' z-index: ' + z + ';');
+          CANVAS_STYLE + ' z-index: ' + z + '')
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method index
      * @return [meta::Layer]
      */
     this.index = function() {
-      var es = this.getUnindexedEntities();
+      var es = this.getUnindexedEntities()
       es.forEach(function(e, idx, array) {
-          var b = e.bound;
-          if (!b && e.onbound) b = e.onbound.call(e.model);
-          if (!b) return;
-          rtree_.insert(b, e);
-          delete array[idx];
-          }, this);
-      this.setUnindexedEntities(es.filter(meta.def));
-      return this;
-    };
+          var b = e.bound
+          if (!b && e.onbound) b = e.onbound.call(e.model)
+          if (!b) return
+          rtree_.insert(b, e)
+          delete array[idx]
+          }, this)
+      this.setUnindexedEntities(es.filter(meta.def))
+      return this
+    }
 
     /**
      * @method reindex
@@ -596,26 +593,26 @@
      * @return [meta2d::Context]
      */
     this.reindex = function(x, y, w, h) {
-      var rect = [x, y, w, h];
+      var rect = [x, y, w, h]
 
       if (meta.undef(rect))
         throw new meta.exception.
-          InvalidParameterException('rect', rect);
+          InvalidParameterException('rect', rect)
       rtree_.remove(rect).forEach(function(e) {
-          this.addEntity(e);
-          }, this);
-      this.index();
+          this.addEntity(e)
+          }, this)
+      this.index()
 
-      return this;
-    };
+      return this
+    }
 
     /**
      * @method getUnindexedEntities
      * @return [Array<meta::Entity>]
      */
     this.getUnindexedEntities = function() {
-      return entities_.slice(0); // Return a copy of the array.
-    };
+      return entities_.slice(0) // Return a copy of the array.
+    }
 
     /**
      * @method setUnindexedEntities
@@ -625,18 +622,18 @@
     this.setUnindexedEntities = function(array) {
       if (meta.undef(array))
         throw new meta.exception.
-          InvalidParameterException('array', array);
-      entities_ = array;
-      return this;
-    };
+          InvalidParameterException('array', array)
+      entities_ = array
+      return this
+    }
 
     // Create a canvas and insert it into the DOM.
-    this.resize(options.w, options.h);
+    this.resize(options.w, options.h)
 
-  };
+  }
 
   meta.mixSafely(meta, {
     Layer: Layer,
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/lru.js b/src/lru.js
index 05dfa0e..4da597d 100644
--- a/src/lru.js
+++ b/src/lru.js
@@ -1,31 +1,28 @@
-/** lru.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/lru.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   /**
    * @class LRU
@@ -45,19 +42,19 @@
    *  The maximum number of (key, value) pairs stored in the cache.
    */
   var LRU = function(capacity) {
-    var map = {}; // key --> node
-    var head = null; // dbl-linked list of {prev, key, val, next} nodes
-    var tail = null;
-    var size = 0;
-    var capacity = capacity || 1;
+    var map = {} // key --> node
+    var head = null // dbl-linked list of {prev, key, val, next} nodes
+    var tail = null
+    var size = 0
+    var capacity = capacity || 1
 
     /**
      * Remove node and reinsert at head, maintaining size count.
      */
     var prioritize = function(node) {
-      pluck(node);
-      pushFront(node);
-    };
+      pluck(node)
+      pushFront(node)
+    }
 
     /**
      * Unlink the tail element for garbage collection iff the cache is
@@ -65,76 +62,76 @@
      * @return [Array]
      */
     var trim = function() {
-      if (size <= capacity) return [];
-      if (!tail) return [];
-      return pluck(tail);
-    };
+      if (size <= capacity) return []
+      if (!tail) return []
+      return pluck(tail)
+    }
 
     /**
      * Remove a node and decrease size count.
      * @return [Array]
      */
     var pluck = function(node) {
-      var removed = [];
+      var removed = []
 
       // Modify links of adjacent nodes.
       if (tail && (tail.key === node.key)) {
         if (node.prev) {
-          tail = node.prev;
-          tail.next = null;
+          tail = node.prev
+          tail.next = null
         } else {
-          tail = null;
+          tail = null
         }
       } else if (head && (head.key === node.key)) {
         if (node.next) {
-          head = node.next;
-          head.prev = null;
+          head = node.next
+          head.prev = null
         } else {
-          head = null;
+          head = null
         }
       } else {
-        if (node.next) node.next.prev = node.prev;
-        if (node.prev) node.prev.next = node.next;
+        if (node.next) node.next.prev = node.prev
+        if (node.prev) node.prev.next = node.next
       }
 
       // Clean up the node.
-      node.prev = node.next = null;
+      node.prev = node.next = null
 
       // Remove the reference.
       if (map[node.key]) {
-        removed.push(map[node.key]);
-        map[node.key] = undefined;
-        size -= 1;
+        removed.push(map[node.key])
+        map[node.key] = undefined
+        size -= 1
       }
 
-      return removed;
-    };
+      return removed
+    }
 
     /**
      * Add node to head and increase size count.
      */
     var pushFront = function(node) {
-      node.prev = null;
-      node.next = head;
-      if (!tail) tail = node;
-      if (head) head.prev = node;
-      head = node;
-      map[node.key] = node;
-      size += 1;
-    };
+      node.prev = null
+      node.next = head
+      if (!tail) tail = node
+      if (head) head.prev = node
+      head = node
+      map[node.key] = node
+      size += 1
+    }
 
     /**
      * Add node to tail end and increase size count.
      */
     var pushBack = function(node) {
-      node.prev = tail;
-      node.next= null;
-      if (!head) head = node;
-      if (tail) tail.next = node;
-      tail = node;
-      map[node.key] = node;
-      size += 1;
-    };
+      node.prev = tail
+      node.next= null
+      if (!head) head = node
+      if (tail) tail.next = node
+      tail = node
+      map[node.key] = node
+      size += 1
+    }
 
     /**
      * @method get
@@ -149,13 +146,13 @@
      * @return Object
      */
     this.get = function(key) {
-      var node = map[key];
+      var node = map[key]
       if (node) {
-        prioritize(node);
-        return node.val;
+        prioritize(node)
+        return node.val
       }
-      return null;
-    };
+      return null
+    }
 
     /**
      * @method pluck
@@ -174,12 +171,12 @@
      */
     this.pluck = function(key) {
       var node = map[key],
-          removed = [];
+          removed = []
 
-      if (node) removed = pluck(node);
+      if (node) removed = pluck(node)
 
-      return removed;
-    };
+      return removed
+    }
 
     /**
      * @method update
@@ -203,16 +200,16 @@
      */
     this.update = function(key, val) {
       // Retrieve old node if it exists, or make a new one.
-      var node = map[key] || {key: key};
+      var node = map[key] || {key: key}
 
-      node.val = val;
+      node.val = val
 
       // Reorder the list with this node in front.
-      prioritize(node);
+      prioritize(node)
 
       // (key, val) is in cache unless capacity is zero.
-      return trim();
-    };
+      return trim()
+    }
 
     /**
      * @method add
@@ -234,14 +231,14 @@
      * @return Array
      */
     this.add = function(key, val) {
-      if (map[key]) return [];
-      return this.update(key, val);
-    };
+      if (map[key]) return []
+      return this.update(key, val)
+    }
 
-  };
+  }
 
   meta.mixSafely(meta, {
     LRU: LRU
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/mask.js b/src/mask.js
index b99f8f3..022abc0 100644
--- a/src/mask.js
+++ b/src/mask.js
@@ -1,31 +1,28 @@
-/** mask.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/lru.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   /**
    * @class Mask
@@ -33,8 +30,8 @@
    * @extends Modifiable<<MaskType>>
    */
   var Mask = function() {
-    meta.Modifiable.call(this, new meta.MaskType());
-  };
+    meta.Modifiable.call(this, new meta.MaskType())
+  }
 
   /**
    * @method overlaps
@@ -46,82 +43,82 @@
    * @return Boolean
    */
   Mask.prototype.overlaps = function(x, y) {
-    throw new meta.exception.InvokedAbstractMethodException();
-  };
+    throw new meta.exception.InvokedAbstractMethodException()
+  }
 
   var Opaque = function(d) {
-    this.drawing = d;
-  };
+    this.drawing = d
+  }
 
-  Opaque.prototype = new Mask();
+  Opaque.prototype = new Mask()
 
   Opaque.prototype.overlaps = function(x, y) {
     if (!this.drawing ||
         meta.math.affine.isSingular(this.drawing.transform)) {
-      return false;
+      return false
     }
 
     var t = this.drawing.transform,
         t_inv = meta.math.affine.invert(t),
-        pixel = meta.math.affine.applyToVector(t_inv, [x, y]);
+        pixel = meta.math.affine.applyToVector(t_inv, [x, y])
 
     return this.drawing.ctx.getImageData(
-        pixel[0], pixel[1], 1, 1).data[3] > 0;
-  };
+        pixel[0], pixel[1], 1, 1).data[3] > 0
+  }
 
   var opaque = function(d) {
-    return new Opaque(d);
-  };
+    return new Opaque(d)
+  }
 
-  var bbox = function(d) {
-    var o = function() {};
+  var BBox = function(d) {
+    this.drawing = d
+  }
+
+  BBox.prototype = new Mask()
 
-    o.prototype = new Mask();
+  BBox.prototype.overlaps = function(x, y) {
+    if (!this.drawing) return false
+    var bounds = this.drawing.getBounds()
+    return meta.math.rect.contains(bounds, [x, y, 1, 1]) 
+  }
 
-    o.prototype.overlaps = function(x, y) {
-      if (!d) return false;
+  var bbox = function(d) {
+    return new BBox(d)
+  }
 
-      var bounds = d.getBounds();
+  var Yes = function() {}
 
-      return meta.math.rect.contains(bounds, [x, y, 1, 1]); 
-    };
+  Yes.prototype = new Mask()
 
-    return new o();
-  };
+  Yes.prototype.overlaps = function() {
+    return true
+  }
 
   var yes = function() {
-    var o = function() {};
+    return new Yes()
+  }
 
-    o.prototype = new Mask();
+  var No = function() {}
 
-    o.prototype.overlaps = function() {
-      return true;
-    };
+  No.prototype = new Mask()
 
-    return new o();
-  };
+  No.prototype.overlaps = function() {
+    return false
+  }
 
   var no = function() {
-    var o = function() {};
-
-    o.prototype = new Mask();
-
-    o.prototype.overlaps = function() {
-      return false;
-    };
-
-    return new o();
-  };
+    return new No()
+  }
 
   meta.mixSafely(meta, {
     Mask: Mask
-  });
+  })
 
   meta.mask = meta.declareSafely(meta.mask, {
     opaque: opaque,
     bbox: bbox,
     yes: yes,
     no: no
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/math/affine.js b/src/math/affine.js
index e95b41f..6974e53 100644
--- a/src/math/affine.js
+++ b/src/math/affine.js
@@ -1,31 +1,28 @@
-/** affine.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/math/affine.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   // We are concerned with square NxN matrices in which the upper-left N-1 x
   // N-1 submatrix represents a linear transformation (scale & rotate) and the
@@ -61,62 +58,62 @@
       m1[1]*m2[2] + m1[3]*m2[3],
       m1[0]*m2[4] + m1[2]*m2[5] + m1[4],
       m1[1]*m2[4] + m1[3]*m2[5] + m1[5],
-    ];
-  };
+    ]
+  }
 
   // Add [e, f] values after scale-rotation.
   var translate = function(t, x, y) {
-    return transform(t, [1, 0, 0, 1, x, y]);
-  };
+    return transform(t, [1, 0, 0, 1, x, y])
+  }
 
   // Scale columns respectively.
   var scale = function(t, x, y) {
-    return transform(t, [x, 0, 0, y, 0, 0]);
-  };
+    return transform(t, [x, 0, 0, y, 0, 0])
+  }
 
   // Rotate without affecting translation column.
   var rotate = function(t, rad) {
     var cos = Math.cos(rad),
-        sin = Math.sin(rad);
-    return transform(t, [cos, sin, -sin, cos, 0, 0]);
-  };
+        sin = Math.sin(rad)
+    return transform(t, [cos, sin, -sin, cos, 0, 0])
+  }
 
   // Return the identity matrix.
   var identity = function() {
-    return [1, 0, 0, 1, 0, 0];
-  };
+    return [1, 0, 0, 1, 0, 0]
+  }
 
   // Return determinant of linear submatrix.
   var det = function(t) {
-    return t[0] * t[3] - t[1] * t[2];
-  };
+    return t[0] * t[3] - t[1] * t[2]
+  }
 
   // Is the linear submatrix singular? That is, is it non-invertible?
   var singular = function(t) {
-    return det(t) === 0;
-  };
+    return det(t) === 0
+  }
 
   // If singular, return identity.
   var invert = function(t) {
-    if (singular(t)) return identity();
+    if (singular(t)) return identity()
     var d = det(t),
-        inv = [t[3], -t[1], -t[2], t[0]].map(function(a) {return a / d;}),
-        neg_inv = inv.map(function(a) {return -a;});
+        inv = [t[3], -t[1], -t[2], t[0]].map(function(a) {return a / d}),
+        neg_inv = inv.map(function(a) {return -a})
     return inv.concat([
         neg_inv[0] * t[4] + neg_inv[2] * t[5],
         neg_inv[1] * t[4] + neg_inv[3] * t[5]
-        ]);
-  };
+        ])
+  }
 
   // Apply transformation to a vector.
   var applyToVector = function(t, v) {
     return [
       t[0] * v[0] + t[2] * v[1] + t[4],
       t[1] * v[0] + t[3] * v[1] + t[5]
-    ];
-  };
+    ]
+  }
 
-  meta.math = meta.declareSafely(meta.math);
+  meta.math = meta.declareSafely(meta.math)
   meta.math.affine = meta.declareSafely(meta.math.affine, {
     translate: translate,
     scale: scale,
@@ -127,6 +124,6 @@
     isSingular: singular,
     invert: invert,
     applyToVector: applyToVector
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/math/rect.js b/src/math/rect.js
index 1a0f6a3..efab6ca 100644
--- a/src/math/rect.js
+++ b/src/math/rect.js
@@ -1,31 +1,28 @@
-/** rect.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/math/rect.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace';
+!function(meta) {
+
+  'use strict'
 
   var xywh_to_tblr = function(xywh) {
     return [
@@ -33,25 +30,25 @@
       xywh[1] + xywh[3],
       xywh[0],
       xywh[0] + xywh[2]
-    ];
-  };
+    ]
+  }
 
   // return [x, y, w, h] from arguments
   var rect = function() {
-    var args = meta.args(arguments);
+    var args = meta.args(arguments)
     if (args.length === 4) {
-      return args; 
+      return args 
     } else if (args.length === 3) {
-      return [args[0], args[1], args[2], 0];
+      return [args[0], args[1], args[2], 0]
     } else if (args.length === 2) {
-      return [args[0], args[1], 0, 0];
+      return [args[0], args[1], 0, 0]
     } else if (args.length === 1) {
       if (meta.isObject(args[0])) {
-        meta.mixSafely(args[0], {x: 0, y: 0, w: 0, h: 0});
-        return [args[0].x, args[0].y, args[0].w, args[0].h];
+        meta.mixSafely(args[0], {x: 0, y: 0, w: 0, h: 0})
+        return [args[0].x, args[0].y, args[0].w, args[0].h]
       }
     }
-    return [0, 0, 0, 0];
+    return [0, 0, 0, 0]
   }
 
   // @return [Rect | null]
@@ -61,16 +58,16 @@
         t = Math.max(tblr1[0], tblr2[0]),
         b = Math.min(tblr1[1], tblr2[1]),
         l = Math.max(tblr1[2], tblr2[2]),
-        r = Math.min(tblr1[3], tblr2[3]);
+        r = Math.min(tblr1[3], tblr2[3])
 
-    if (b < t || r < l) return null;
+    if (b < t || r < l) return null
     if (t === b) {
-      if (t === tblr1[0] && t >= tblr2[1]) return null;
-      if (t === tblr2[0] && t >= tblr1[1]) return null;
+      if (t === tblr1[0] && t >= tblr2[1]) return null
+      if (t === tblr2[0] && t >= tblr1[1]) return null
     }
     if (l === r) {
-      if (l === tblr1[2] && l >= tblr2[3]) return null;
-      if (l === tblr2[2] && l >= tblr1[3]) return null;
+      if (l === tblr1[2] && l >= tblr2[3]) return null
+      if (l === tblr2[2] && l >= tblr1[3]) return null
     }
 
     return [
@@ -78,34 +75,34 @@
       t,
       r - l,
       b - t
-    ];
-  };
+    ]
+  }
 
   // @return [Boolean]
   var contains = function(r1, r2) {
     return r2[0] >= r1[0] &&
            r2[1] >= r1[1] &&
            r2[0] + r2[2] <= r1[0] + r1[2] &&
-           r2[1] + r2[3] <= r1[1] + r1[3];
-  };
+           r2[1] + r2[3] <= r1[1] + r1[3]
+  }
 
   // @return [Boolean]
   var containedBy = function(r1, r2) {
-    return contains(r2, r1);
-  };
+    return contains(r2, r1)
+  }
 
   // @return [Boolean]
   var equal = function(r1, r2) {
     return r1[0] === r2[0] &&
            r1[1] === r2[1] &&
            r1[2] === r2[2] &&
-           r1[3] === r2[3];
-  };
+           r1[3] === r2[3]
+  }
 
   // @return [Number]
   var area = function(r) {
-    return r[2] * r[3];
-  };
+    return r[2] * r[3]
+  }
 
   meta.math.rect = meta.declareSafely(meta.math.rect, {
     rect: rect,
@@ -114,6 +111,6 @@
     containedBy: containedBy,
     equal: equal,
     area: area
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/math/vector.js b/src/math/vector.js
index fbad7a7..35faa81 100644
--- a/src/math/vector.js
+++ b/src/math/vector.js
@@ -1,114 +1,111 @@
-/** vector.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/math/vector.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   // a Vector is an Array
   var vector = function() {
-    var ret = new Array();
-    return ret.concat(meta.args(arguments));
-  };
+    var ret = new Array()
+    return ret.concat(meta.args(arguments))
+  }
 
   /** and 2 values */
   var ander = function(a, b) {
-    if (meta.undef(a)) a = false;
-    if (meta.undef(b)) b = false;
-    return !!a && !!b;
-  };
+    if (meta.undef(a)) a = false
+    if (meta.undef(b)) b = false
+    return !!a && !!b
+  }
 
   /** add 2 values */
   var adder = function(a, b) {
-    a = a || 0;
-    b = b || 0;
-    return a + b;
-  };
+    a = a || 0
+    b = b || 0
+    return a + b
+  }
 
   /** multiply 2 values */
   var multiplier = function(a, b) {
-    if (meta.undef(a) || meta.isNull(a)) a = 1;
-    if (meta.undef(b) || meta.isNull(b)) b = 1;
-    return a * b;
-  };
+    if (meta.undef(a) || meta.isNull(a)) a = 1
+    if (meta.undef(b) || meta.isNull(b)) b = 1
+    return a * b
+  }
 
   /** return true if two values are equivalent */
   var equality = function(a, b) {
-    return a === b;
-  };
+    return a === b
+  }
 
   var max2 = function(a, b) {
-    return meta.max(a, b);
-  };
+    return meta.max(a, b)
+  }
 
   /** all vectors are equivalent */
   var equal = function() {
     if (arguments.length < 1)
-      return new meta.exception.InvalidParameterException();
+      return new meta.exception.InvalidParameterException()
     var args = meta.args(arguments),
         max = args.map(meta.len).reduce(max2),
-        ref, i, brk;
-    if (max === 0) return true;
+        ref, i, brk
+    if (max === 0) return true
 
     for (i = 0; i < max; i++) {
-      ref = meta.idx(i, args[0]);
+      ref = meta.idx(i, args[0])
       args.forEach(function(array) {
-          if (!equality(meta.idx(i, array), ref)) brk = true;
-          });
-      if (brk) return false;
+          if (!equality(meta.idx(i, array), ref)) brk = true
+          })
+      if (brk) return false
     }
 
-    return true;
-  };
+    return true
+  }
 
   /** sum any number of vectors */
   var plus = function() {
-    return meta.args(arguments).reduce(meta.zip.bind(void 0, adder));
-  };
+    return meta.args(arguments).reduce(meta.zip.bind(void 0, adder))
+  }
 
   /** scale a vector */
   var scale = function(v, val) {
     return v.map(function(e) {
-        return e * val;
-        });
-  };
+        return e * val
+        })
+  }
 
   /** subtract one vector from another */
   var minus = function(v1, v2) {
-    return meta.zip(adder, v1, scale(v2, -1));
-  };
+    return meta.zip(adder, v1, scale(v2, -1))
+  }
 
   /** multiply corresponding elements in any number of vectors */
   var mult = function() {
-    return meta.args(arguments).reduce(meta.zip.bind(void 0, multiplier));
-  };
+    return meta.args(arguments).reduce(meta.zip.bind(void 0, multiplier))
+  }
 
   /** reciprocal each element in a vector */
   var invert = function(v) {
-    return v.map(function(e) {return 1/e;});
-  };
+    return v.map(function(e) {return 1/e})
+  }
 
   meta.math.vector = meta.declareSafely(meta.math.vector, {
     vector: vector,
@@ -118,6 +115,6 @@
     scale: scale,
     mult: mult,
     invert: invert
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/meta2d.js b/src/meta2d.js
index 30bfb08..aab03d0 100644
--- a/src/meta2d.js
+++ b/src/meta2d.js
@@ -1,59 +1,54 @@
-/** meta2d.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/meta2d.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *  Enhancements for Canvas 2d Context.
- * 
- *      This file is part of Meta2D.
- *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * This file is part of Meta2D.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function () {
-  'use strict';
+!function (meta) {
 
-  // The global context (usually the root window in a web client).
-  var root = this;
+  'use strict'
 
   // Promiscuously mix in properties.
   var mix = function(host, vector) {
-    host = host || {};
-    if (!vector) return host;
-    for (var a in vector) host[a] = vector[a];
-    return host;
-  };
+    host = host || {}
+    if (!vector) return host
+    for (var a in vector) host[a] = vector[a]
+    return host
+  }
 
   // Only mix in novel properties.
   var safe_mix = function(host, vector) {
-    host = host || {};
-    if (!vector) return host;
+    host = host || {}
+    if (!vector) return host
     for (var a in vector)
-      if (! (a in host)) host[a] = vector[a];
-    return host;
-  };
+      if (! (a in host)) host[a] = vector[a]
+    return host
+  }
 
   // Create a new object/namespace or mix-in with what's already present.
   var declare = function(o, init) {
-    return (o && safe_mix(o, init)) || init || {};
-  };
+    return (o && safe_mix(o, init)) || init || {}
+  }
 
-  var meta = root.meta2d = declare(root.meta2d, {
-    VERSION: '0.epsilon'
-  });
+  safe_mix(meta, {
+    VERSION: '0.ε'
+  })
 
   // Some basic utilities.
   var undef = function(o) {return typeof o === 'undefined'},
@@ -61,130 +56,129 @@
       is_function = function(o) {return typeof o === 'function'},
       is_null = function(o) {
         return (typeof o === 'object' && !o)
-        /* || (typeof o ==='null') potential Ecmascript 5.1 */;
       },
       is_number = function(o) {return typeof o === 'number'},
       is_object = function(o) {return typeof o === 'object'},
       is_string = function(o) {return typeof o === 'string'},
-      inherits = function(o, parent) {return o instanceof parent;};
+      inherits = function(o, parent) {return o instanceof parent}
 
   // Some less-basic utilities.
 
   /** Length of an array */
   var len = function(ary) {
-    return ary.length;
-  };
+    return ary.length
+  }
 
   /** Make an honest array out of argument object */
   var args = function(argument_object) {
-    return Array.prototype.slice.call(argument_object, 0);
-  };
+    return Array.prototype.slice.call(argument_object, 0)
+  }
 
   /** Maximum value */
   var max = function() {
-    return args(arguments).reduce(function(a, b) {return (a > b) ? a : b;});
-  };
+    return args(arguments).reduce(function(a, b) {return (a > b) ? a : b})
+  }
 
   /** Minimum value */
   var min = function() {
-    return args(arguments).reduce(function(a, b) {return (a > b) ? b : a;});
-  };
+    return args(arguments).reduce(function(a, b) {return (a > b) ? b : a})
+  }
 
   /** Concatenate two arrays */
   var concat = function(a1, a2) {
-    return a1.concat(a2);
-  };
+    return a1.concat(a2)
+  }
 
   /** Get index in array or null (undefined may be undesirable) */
   var index = function(i, array) {
-    if (i >= array.length || i < 0) return null;
-    return array[i];
-  };
+    if (i >= array.length || i < 0) return null
+    return array[i]
+  }
 
   /** Line up 2 arrays and perform a function on elements pairwise */
   var zip = function(f, a1, a2) {
-    var ret = new Array(Math.max(a1.length, a2.length));
+    var ret = new Array(Math.max(a1.length, a2.length))
 
     for (var i = 0; i < ret.length; i++) {
-      ret[i] = f.call(void 0, index(i, a1), index(i, a2));
+      ret[i] = f.call(void 0, index(i, a1), index(i, a2))
     }
 
-    return ret;
-  };
+    return ret
+  }
 
   /** Sort an array of entities by their 'z' attribute' */
   var zsort = function(array) {
     return array.sort(function(a, b) {
-        return  (a.z || -Infinity) - (b.z || -Infinity);
-        });
-  };
+      return  (a.z || -Infinity) - (b.z || -Infinity)
+    })
+  }
 
   /** Get the runtime in milliseconds */
-  var time = (function() {
-    var start = new Date().getTime();
+  var time = function() {
+    var start = (new Date()).getTime()
     return function() {
-      return new Date().getTime() - start;
-    };
-  })();
+      return new Date().getTime() - start
+    }
+  }()
 
   /** Get a random number in the interval [0, 1) */
   var rand = function() {
-    return Math.random();
-  };
+    return Math.random()
+  }
 
   /** Get a random integer in the specified interval (inclusive) */
   var randInt = function(low, high) {
-    return Math.floor(low + (high - low + 1) * rand());
-  };
+    return Math.floor(low + (high - low + 1) * rand())
+  }
 
   /** Round down a float to an integer */
   var floor = function(val) {
-    return val << 0;
-  };
+    return val << 0
+  }
 
   /** Round a float to an integer */
   var round = function(val) {
-    return (0.5 + val) << 0;
-  };
+    return (0.5 + val) << 0
+  }
 
   /** Convert an array into a string */
   var serialize = function(array) {
-    return array.join(',');
-  };
+    return array.join(',')
+  }
 
   /** Cycle through any number of callbacks */
   var toggle = function() {
     var fs = args(arguments),
-        current = 0;
+        current = 0
     var f = function() {
-      current %= fs.length;
-      return fs[current++].call(this);
-    };
-    return f;
-  };
+      current %= fs.length
+      return fs[current++].call(this)
+    }
+    return f
+  }
 
   /** Format a color string */
 
   var hsla = function(h, s, l, a) {
-    return 'hsla(' + h + ',' + s + '%,' + l + '%,' + a + ')';
-  };
+    return 'hsla(' + h + ',' + s + '%,' + l + '%,' + a + ')'
+  }
 
   var hsl = function(h, s, l) {
-    return hsla(h, s, l, 1);
-  };
+    return hsla(h, s, l, 1)
+  }
 
   var rgba = function(r, g, b, a) {
-    return 'rgba' + r + ',' + g + ',' + b + ',' + a + ')';
-  };
+    return 'rgba' + r + ',' + g + ',' + b + ',' + a + ')'
+  }
 
   var rgb = function(r, g, b) {
-    return rgba(r, g, b, 1);
-  };
+    return rgba(r, g, b, 1)
+  }
 
   // Modifiable Types
   var MaskType = function() {},
       ProjectionType = function() {},
-      TweenType = function() {};
+      TweenType = function() {}
 
   safe_mix(meta, {
     def: def,
@@ -220,25 +214,25 @@
     MaskType: MaskType,
     ProjectionType: ProjectionType,
     TweenType: TweenType
-  });
+  })
 
   // Create a new kind of exception.
   var makeX = function(name) {
     var x = function() {
-      this.message = args(arguments).join(':');
-      this.name = name;
-    };
+      this.message = args(arguments).join(':')
+      this.name = name
+    }
     x.prototype.toString = function() {
-      return this.name + ' - ' + this.message;
-    };
-    return x;
-  };
+      return this.name + ' - ' + this.message
+    }
+    return x
+  }
 
   // Exceptions used in this library.
   meta.exception = meta.declareSafely(meta.exception, {
     InvalidParameterException: makeX('InvalidParameterException'),
     InvokedAbstractMethodException: makeX('InvokedAbstractMethodException'),
     InvalidTemplateException: makeX('InvalidTemplateException')
-  });
+  })
 
-}).call(this);
+}(this.meta2d = {});
diff --git a/src/metacontext.js b/src/metacontext.js
index 0346ab7..5f23312 100644
--- a/src/metacontext.js
+++ b/src/metacontext.js
@@ -1,33 +1,30 @@
-/** metacontext.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/metacontext.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this,
-      meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var ENTITY_COUNT = 0;
+  var ENTITY_COUNT = 0
 
   /**
    * @class MetaContext
@@ -46,9 +43,9 @@
    */
   var MetaContext = function(node, options) {
     if (meta.isString(node))
-      node = document.getElementById(node);
+      node = document.getElementById(node)
     if (!node)
-      throw new meta.exception.InvalidParameterException();
+      throw new meta.exception.InvalidParameterException()
 
     var parent_,
         options_ = options,
@@ -66,36 +63,36 @@
         mouse_ = [0, 0],
         w_ = options_ && options_.w,
         h_ = options_ && options_.h,
-        canvas_ = void 0;
+        canvas_ = void 0
 
     // @private
     var getActiveLayer_ = function() {
-      var layer = layers_[activeLayer_];
+      var layer = layers_[activeLayer_]
       if (!layer)
-        throw new meta.exception.NoLayerException();
-      return layer;
-    };
+        throw new meta.exception.NoLayerException()
+      return layer
+    }
 
     /**
      * @method getWidth
      */
     this.getWidth = function() {
-      return w_;
-    };
+      return w_
+    }
 
     /**
      * @method getHeight
      */
     this.getHeight = function() {
-      return h_;
-    };
+      return h_
+    }
 
     /**
      * @method getRootNode
      */
     this.getRootNode = function() {
-      return parent_;
-    };
+      return parent_
+    }
 
     /**
      * @method camera
@@ -108,8 +105,8 @@
      */
     this.camera = function(x, y) {
       if (meta.undef(x) || meta.undef(y)) return cameraPos_
-      return cameraPos_ = [x, y];
-    };
+      return cameraPos_ = [x, y]
+    }
 
     /**
      * @method cursor
@@ -119,9 +116,9 @@
      * @return
      */
     this.cursor = function(pos) {
-      if (!pos) return cursorPos_;
-      return cursorPos_ = pos.slice(0);
-    };
+      if (!pos) return cursorPos_
+      return cursorPos_ = pos.slice(0)
+    }
 
     /**
      * @method put
@@ -138,25 +135,25 @@
      * @return entity
      */
     this.put = function(tags, options) {
-      if (meta.isString(tags)) tags = tags.split(' ');
-      tags.push('*');
+      if (meta.isString(tags)) tags = tags.split(' ')
+      tags.push('*')
       var l = getActiveLayer_(),
           e = meta.mixSafely({
             id: ENTITY_COUNT++,
             tags: tags,
-            layer: l}, options);
+            layer: l}, options)
 
-      meta.mixSafely(e, {model: {}});
+      meta.mixSafely(e, {model: {}})
       tags.forEach(function(t) {
-          var es = tags_[t];
-          if (meta.undef(es)) es = tags_[t] = {};
-          es[e.id] = e;
-          });
+          var es = tags_[t]
+          if (meta.undef(es)) es = tags_[t] = {}
+          es[e.id] = e
+          })
 
-      l.put(e);
+      l.put(e)
             
-      return e;
-    };
+      return e
+    }
 
     /**
      * @method array
@@ -168,16 +165,16 @@
     this.array = function(n, tags, options) {
       var e = {
         children: []
-      };
+      }
 
       while (n--) {
-        options.child = n;
-        options.parent = e;
-        e.children.push(this.put(tags, options));
+        options.child = n
+        options.parent = e
+        e.children.push(this.put(tags, options))
       }
 
-      return this.put(tags, e);
-    };
+      return this.put(tags, e)
+    }
 
     /**
      * @method select
@@ -190,17 +187,17 @@
      */
     this.select = function() {
       var sel = {},
-          tags = meta.args(arguments);
+          tags = meta.args(arguments)
 
       tags.forEach(function(t) {
-          if (meta.isString(t)) t = t.split(' ');
+          if (meta.isString(t)) t = t.split(' ')
           t.forEach(function(tag) {
-              meta.mixSafely(sel, tags_[tag]);
-              });
-          });
+              meta.mixSafely(sel, tags_[tag])
+              })
+          })
       
-      return Object.keys(sel).map(function(id) {return sel[id];});
-    };
+      return Object.keys(sel).map(function(id) {return sel[id]})
+    }
 
     /**
      * @method remove
@@ -213,18 +210,18 @@
      *  Return the entities that were removed.
      */
     this.remove = function() {
-      var es = this.select.apply(this, arguments);
+      var es = this.select.apply(this, arguments)
 
       es.forEach(function(e) {
           e.tags.forEach(function(tag) {
-              delete tags_[tag][e.id];
+              delete tags_[tag][e.id]
               if (Object.keys(tags_[tag]).length === 0)
-                delete tags_[tag];
-              });
-          });
+                delete tags_[tag]
+              })
+          })
 
-      return es;
-    };
+      return es
+    }
 
     /**
      * @method layer
@@ -239,11 +236,11 @@
      */
     this.layer = function(name) {
       if (! (name in layers_)) {
-        layers_[name] = new meta.Layer(this, options_);
+        layers_[name] = new meta.Layer(this, options_)
       }
-      activeLayer_ = name;
-      return this;
-    };
+      activeLayer_ = name
+      return this
+    }
 
     /**
      * @method removeLayer
@@ -256,9 +253,9 @@
      *  thisArg
      */
     this.removeLayer = function(name) {
-      delete layers_[name];
-      return this;
-    };
+      delete layers_[name]
+      return this
+    }
 
     /**
      * @method resize
@@ -274,133 +271,133 @@
      */
     this.resize = function(w, h) {
       if (meta.undef(w) || meta.undef(h))
-        throw new meta.exception.InvalidParameterException();
+        throw new meta.exception.InvalidParameterException()
       
       // Do nothing if parent is set and dimensions haven't changed.
-      if (w_ === w && h_ === h  && parent_) return this;
+      if (w_ === w && h_ === h  && parent_) return this
 
-      w_ = w;
-      h_ = h;
+      w_ = w
+      h_ = h
 
-      if (!parent_) parent_ = document.createElement('div');
+      if (!parent_) parent_ = document.createElement('div')
 
       var style = canvas_ ?
         '' :
         'width: ' + w + 'px; ' +
         'height: ' + h + 'px; ' +
-        'position: relative;';
+        'position: relative;'
 
-      parent_.setAttribute('style', style);
+      parent_.setAttribute('style', style)
 
       Object.keys(layers_).forEach(function(l) {
-          layers_[l].resize(w, h);
-          }, this);
+          layers_[l].resize(w, h)
+          }, this)
 
-      return this;
-    };
+      return this
+    }
 
     // Defer to active layer.
     var defer_to_layer = function(method) {
       var f = function() {
-        var layer = getActiveLayer_();
-        return layer[method].apply(layer, arguments);
-      };
-      this[method] = f.bind(this);
-    };
+        var layer = getActiveLayer_()
+        return layer[method].apply(layer, arguments)
+      }
+      this[method] = f.bind(this)
+    }
 
     var defer_to_all_layers = function(method) {
       var f = function() {
-        var args = arguments;
+        var args = arguments
         Object.keys(layers_).forEach(function(l) {
             layers_[l][method.slice(0, -3)].apply(layers_[l], args)
-             });
-      };
-      this[method] = f.bind(this);
-    };
+             })
+      }
+      this[method] = f.bind(this)
+    }
 
     // Invoke Context2d method of active layer.
     var invoke_in_layer_context = function(method) {
       var f = function() {
         var layer = getActiveLayer_(),
-            ctx = layer.getContext();
-        return ctx[method].apply(ctx, arguments);
-      };
-      this[method] = f.bind(this);
-    };
-
-    [ // Rendering methods on active layer.
-      'crop',
-      'erase',
-      'draw',
-      'flip',
-      'prune',
-      'render',
-      'memo',
-      'repaint',
-      'parallax',
-      'z',
-      'index',
-      'reindex',
-      'makeDrawing',
-      'getContext'
-    ].forEach(defer_to_layer, this);
-
-    [ // Rendering methods on all layers.
-      'cropAll',
-      'eraseAll',
-      'drawAll',
-      'flipAll',
-      'pruneAll',
-      'renderAll',
-      'memoAll',
-      'repaintAll'
-    ].forEach(defer_to_all_layers, this);
-
-    [ // Context2d methods.
-      'save',
-      'restore',
-      'scale',
-      'rotate',
-      'translate',
-      'transform',
-      'setTransform',
-      'createLinearGradient',
-      'createRadialGradient',
-      'createPattern',
-      'clearRect',
-      'fillRect',
-      'strokeRect',
-      'beginPath',
-      'closePath',
-      'moveTo',
-      'lineTo',
-      'quadraticCurveTo',
-      'arcTo',
-      'rect',
-      'arc',
-      'fill',
-      'stroke',
-      'clip',
-      'isPointInPath',
-      'drawFocusRing',
-      'caretBlinkRate',
-      'setCaretSelectionRect',
-      'fillText',
-      'strokeText',
-      'measureText',
-      'drawImage',
-      'createImageData',
-      'getImageData',
-      'putImageData'
-    ].forEach(invoke_in_layer_context, this);
+            ctx = layer.getContext()
+        return ctx[method].apply(ctx, arguments)
+      }
+      this[method] = f.bind(this)
+    }
+
+    // Rendering methods on active layer.
+    ;['crop'
+    , 'erase'
+    , 'draw'
+    , 'flip'
+    , 'prune'
+    , 'render'
+    , 'memo'
+    , 'repaint'
+    , 'parallax'
+    , 'z'
+    , 'index'
+    , 'reindex'
+    , 'makeDrawing'
+    , 'getContext'
+    ].forEach(defer_to_layer, this)
+
+    // Rendering methods on all layers.
+    ;['cropAll'
+    , 'eraseAll'
+    , 'drawAll'
+    , 'flipAll'
+    , 'pruneAll'
+    , 'renderAll'
+    , 'memoAll'
+    , 'repaintAll'
+    ].forEach(defer_to_all_layers, this)
+
+    // Context2d methods.
+    ;['save'
+    , 'restore'
+    , 'scale'
+    , 'rotate'
+    , 'translate'
+    , 'transform'
+    , 'setTransform'
+    , 'createLinearGradient'
+    , 'createRadialGradient'
+    , 'createPattern'
+    , 'clearRect'
+    , 'fillRect'
+    , 'strokeRect'
+    , 'beginPath'
+    , 'closePath'
+    , 'moveTo'
+    , 'lineTo'
+    , 'quadraticCurveTo'
+    , 'arcTo'
+    , 'rect'
+    , 'arc'
+    , 'fill'
+    , 'stroke'
+    , 'clip'
+    , 'isPointInPath'
+    , 'drawFocusRing'
+    , 'caretBlinkRate'
+    , 'setCaretSelectionRect'
+    , 'fillText'
+    , 'strokeText'
+    , 'measureText'
+    , 'drawImage'
+    , 'createImageData'
+    , 'getImageData'
+    , 'putImageData'
+    ].forEach(invoke_in_layer_context, this)
 
     var get = function(attribute) {
-      return getActiveLayer_().getContext()[attribute];
-    };
+      return getActiveLayer_().getContext()[attribute]
+    }
 
     var set = function(attribute, value) {
-      getActiveLayer_().getContext()[attribute] = value;
-    };
+      getActiveLayer_().getContext()[attribute] = value
+    }
 
     // Define getter/setter for writable Context2d properties.
     var layer_context_attribute = function(attribute) {
@@ -408,41 +405,41 @@
           get: get.bind(this, attribute),
           set: set.bind(this, attribute),
           enumerable: true,
-          });
-    };
-
-    [ // Context2d attributes layer-multiplexed via getters/setters.
-      'globalAlpha',
-      'globalCompositeOperation',
-      'strokeStyle',
-      'fillStyle',
-      'lineWidth',
-      'lineCap',
-      'lineJoin',
-      'miterLimit',
-      'shadowOffsetX',
-      'shadowOffsetY',
-      'shadowBlur',
-      'shadowColor',
-      'font',
-      'textAlign',
-      'textBaseline'
-    ].forEach(layer_context_attribute, this);
+          })
+    }
+
+    // Context2d attributes layer-multiplexed via getters/setters.
+    ;['globalAlpha'
+    , 'globalCompositeOperation'
+    , 'strokeStyle'
+    , 'fillStyle'
+    , 'lineWidth'
+    , 'lineCap'
+    , 'lineJoin'
+    , 'miterLimit'
+    , 'shadowOffsetX'
+    , 'shadowOffsetY'
+    , 'shadowBlur'
+    , 'shadowColor'
+    , 'font'
+    , 'textAlign'
+    , 'textBaseline'
+    ].forEach(layer_context_attribute, this)
 
     // read-only 'canvas' attribute of Context2d.
     Object.defineProperty(this, 'canvas', {
         get: get.bind(this, 'canvas'),
         set: void 0,
         enumerable: true
-        });
+        })
 
     /**
      * @method getAllLayers
      * @return Array<<Layer>>
      */
     this.getAllLayers = function() {
-      return Object.keys(layers_).map(function(k) {return layers_[k];});
-    };
+      return Object.keys(layers_).map(function(k) {return layers_[k]})
+    }
 
     // pick() method concats all layer output.
     /**
@@ -464,245 +461,245 @@
       var ls = this.getAllLayers().map(function(layer) {return {
           z: layer.z(),
           es: layer.pick(x, y)
-          };});
+          }})
 
       // 4 potential outputs based on sorted/layered options
       if (sorted) {
         if (layered) {
           // sorted by layer.z, then e.z
           ls.forEach(function(l) {
-              l.es = meta.zsort(l.es).reverse();
-              });
-          ls = meta.zsort(ls).reverse();
-          ls = ls.map(function(l) {return l.es;});
-          ls = ls.reduce(meta.concat);
+              l.es = meta.zsort(l.es).reverse()
+              })
+          ls = meta.zsort(ls).reverse()
+          ls = ls.map(function(l) {return l.es})
+          ls = ls.reduce(meta.concat)
         } else {
           // sorted by e.z across layers
-          ls = ls.map(function(l) {return l.es;});
-          ls = ls.reduce(meta.concat);
-          ls = meta.zsort(ls).reverse();
+          ls = ls.map(function(l) {return l.es})
+          ls = ls.reduce(meta.concat)
+          ls = meta.zsort(ls).reverse()
         }
       } else {
         if (layered) {
-          ls = meta.zsort(ls).reverse();
+          ls = meta.zsort(ls).reverse()
         }
-        ls = ls.map(function(l) {return l.es});
-        ls = ls.reduce(meta.concat, []);
+        ls = ls.map(function(l) {return l.es})
+        ls = ls.reduce(meta.concat, [])
       }
 
-      return ls;
-    };
+      return ls
+    }
 
     var position = function(element) {
-      if (!element.offsetParent) return [0, 0];
+      if (!element.offsetParent) return [0, 0]
       return meta.math.vector.plus(
           position(element.offsetParent),
-          [element.offsetLeft, element.offsetTop]);
-    };
+          [element.offsetLeft, element.offsetTop])
+    }
 
     var mouse_pos = function(event) {
       var offset = position(parent_),
-          mouse = [event.pageX, event.pageY];
-      return meta.math.vector.minus(mouse, offset);
+          mouse = [event.pageX, event.pageY]
+      return meta.math.vector.minus(mouse, offset)
     }
 
     var handle_click = function(event) {
       var mouse = mouse_pos(event),
-          hits = this.pick.call(this, mouse[0], mouse[1], true, true);
+          hits = this.pick.call(this, mouse[0], mouse[1], true, true)
 
-      if (!hits.length) return;
+      if (!hits.length) return
 
-      var top = hits[0];
-      if (!top.onclick) return;
+      var top = hits[0]
+      if (!top.onclick) return
 
-      top.onclick.apply(top, mouse);
-    };
+      top.onclick.apply(top, mouse)
+    }
 
     var handle_dblclick = function(event) {
       var mouse = mouse_pos(event),
-          hits = this.pick.call(this, mouse[0], mouse[1], true, true);
+          hits = this.pick.call(this, mouse[0], mouse[1], true, true)
 
-      if (!hits.length) return;
+      if (!hits.length) return
 
-      var top = hits[0];
-      if (!top.ondblclick) return;
+      var top = hits[0]
+      if (!top.ondblclick) return
 
-      top.ondblclick.apply(top, mouse);
-    };
+      top.ondblclick.apply(top, mouse)
+    }
 
     var handle_mousemove = function(event) {
       var mouse = mouse_pos(event),
           diff = meta.math.vector.minus(mouse, mouse_),
           hits = this.pick.call(this, mouse[0], mouse[1], true, true),
-          top;
+          top
 
-      if (hits.length) top = hits[0];
+      if (hits.length) top = hits[0]
 
-      this.cursor(mouse);
+      this.cursor(mouse)
 
       // trigger mouseout event
       if (top != hover_ && hover_ && hover_.onmouseout)
-        hover_.onmouseout.apply(hover_, mouse);
+        hover_.onmouseout.apply(hover_, mouse)
 
       // trigger mouseover event
       if (top && top != hover_ && top.onmouseover)
-        top.onmouseover.apply(top, mouse);
+        top.onmouseover.apply(top, mouse)
 
       // trigger mousemove event
       if (top && top.onmousemove)
-        top.onmousemove.apply(top, mouse);
+        top.onmousemove.apply(top, mouse)
 
       // trigger drag event
       if (dragged_ && dragged_.ondrag)
-        dragged_.ondrag.call(dragged_, mouse[0], mouse[1], diff[0], diff[1]);
+        dragged_.ondrag.call(dragged_, mouse[0], mouse[1], diff[0], diff[1])
 
       // set the mouse cursor
       if (top && top.cursor) {
-        this.getRootNode().style.cursor = top.cursor;
+        this.getRootNode().style.cursor = top.cursor
       } else {
-        this.getRootNode().style.cursor = 'default';
+        this.getRootNode().style.cursor = 'default'
       }
 
-      hover_ = top;
-      mouse_ = mouse;
-    };
+      hover_ = top
+      mouse_ = mouse
+    }
 
     var handle_mousedown = function(event) {
       var mouse = mouse_pos(event),
           hits = this.pick.call(this, mouse[0], mouse[1], true, true),
-          top;
+          top
 
       if (hits.length) {
-        top = hits[0];
+        top = hits[0]
 
         // trigger mousedown event
         if (top && top.onmousedown)
-          top.onmousedown.apply(top, mouse);
+          top.onmousedown.apply(top, mouse)
 
         if (top && top.ondrag) {
-          dragged_ = top;
+          dragged_ = top
         }
       }
 
       if (top != focus_)
-        handle_textinput_blur(event);
+        handle_textinput_blur(event)
 
-      focus_ = focus_default_ = top;
+      focus_ = focus_default_ = top
 
       if (focus_ && focus_.onfocus) {
-        handle_textinput_focus();
+        handle_textinput_focus()
       }
       
-      event.preventDefault();
-    };
+      event.preventDefault()
+    }
 
     var handle_mouseup = function(event) {
       var mouse = mouse_pos(event),
           hits = this.pick.call(this, mouse[0], mouse[1], true, true),
-          top;
+          top
 
-      if (hits.length) top = hits[0];
+      if (hits.length) top = hits[0]
 
       // trigger mouseup event
       if (top && top.onmouseup)
-        top.onmouseup.apply(top, mouse);
+        top.onmouseup.apply(top, mouse)
 
       // trigger drop event
       if (dragged_ && dragged_.ondrop)
-        dragged_.ondrop.apply(dragged_, mouse);
+        dragged_.ondrop.apply(dragged_, mouse)
 
       // clear dragged entity
-      dragged_ = null;
-    };
+      dragged_ = null
+    }
 
     var handle_mouseout = function(event) {
-      var mouse = mouse_pos(event);
+      var mouse = mouse_pos(event)
 
       // trigger mouseout event
       if (hover_ && hover_.onmouseout)
-        hover_.onmouseout.apply(hover_, mouse);
+        hover_.onmouseout.apply(hover_, mouse)
 
       // trigger drop event
       if (dragged_ && hover_.ondrop)
-        dragged_.ondrop.apply(dragged_, mouse);
+        dragged_.ondrop.apply(dragged_, mouse)
 
       // clear dragged entity
-      dragged_ = null;
+      dragged_ = null
 
       // clear hovered entity
-      hover_ = null;
-    };
+      hover_ = null
+    }
 
     var handle_textinput = function(event) {
       // trigger textinput event
       if (focus_ && focus_.ontextinput) {
-        focus_.ontextinput.call(focus_, event, event.data);
+        focus_.ontextinput.call(focus_, event, event.data)
       }
-      textinput_.value = '';
-    };
+      textinput_.value = ''
+    }
 
     var handle_textinput_blur = function(event) {
       // trigger blur event on focused entity
       if (focus_ && focus_.onblur)
-        focus_.onblur.call(focus_);
-    };
+        focus_.onblur.call(focus_)
+    }
 
     var handle_textinput_focus = function(event) {
       if (!event) {
-        focus_ = focus_default_;
+        focus_ = focus_default_
       }
 
       if (focus_ && focus_.onfocus)
-        focus_.onfocus.call(focus_);
+        focus_.onfocus.call(focus_)
 
       if (focus_ && focus_.contentEditable) {
-        textinput_.focus();
+        textinput_.focus()
       }
-    };
+    }
 
     // Set up the injected DOM elements.
 
-    this.resize(w_, h_);
-    layers_['default'] = new meta.Layer(this, options_);
-    node.appendChild(parent_);
+    this.resize(w_, h_)
+    layers_['default'] = new meta.Layer(this, options_)
+    node.appendChild(parent_)
 
     // Listen to DOM mouse events.
 
-    parent_.addEventListener('click', handle_click.bind(this));
-    parent_.addEventListener('mousedown', handle_mousedown.bind(this));
-    parent_.addEventListener('mouseup', handle_mouseup.bind(this));
-    parent_.addEventListener('mousemove', handle_mousemove.bind(this));
-    parent_.addEventListener('mouseout', handle_mouseout.bind(this));
-    parent_.addEventListener('dblclick', handle_dblclick.bind(this));
+    parent_.addEventListener('click', handle_click.bind(this))
+    parent_.addEventListener('mousedown', handle_mousedown.bind(this))
+    parent_.addEventListener('mouseup', handle_mouseup.bind(this))
+    parent_.addEventListener('mousemove', handle_mousemove.bind(this))
+    parent_.addEventListener('mouseout', handle_mouseout.bind(this))
+    parent_.addEventListener('dblclick', handle_dblclick.bind(this))
 
     // Listen to DOM textInput event via hidden input.
 
-    textinput_ = document.createElement('input');
-    textinput_.style.position = 'fixed';
-    textinput_.style.left = '-31337px';
-    textinput_.addEventListener('textInput', handle_textinput.bind(this));
-    textinput_.addEventListener('blur', handle_textinput_blur.bind(this));
-    textinput_.addEventListener('focus', handle_textinput_focus.bind(this));
-    parent_.appendChild(textinput_);
-  };
+    textinput_ = document.createElement('input')
+    textinput_.style.position = 'fixed'
+    textinput_.style.left = '-31337px'
+    textinput_.addEventListener('textInput', handle_textinput.bind(this))
+    textinput_.addEventListener('blur', handle_textinput_blur.bind(this))
+    textinput_.addEventListener('focus', handle_textinput_focus.bind(this))
+    parent_.appendChild(textinput_)
+  }
 
   var create = function(node, options) {
     if (meta.isString(node))
-      node = document.getElementById(node);
+      node = document.getElementById(node)
     if (!node)
-      throw new meta.exception.InvalidParameterException();
+      throw new meta.exception.InvalidParameterException()
 
     options = meta.mixSafely(options, {
       w: node.clientWidth || 300,
       h: node.clientHeight || 150
-    });
+    })
 
-    return new MetaContext(node, options);
-  };
+    return new MetaContext(node, options)
+  }
 
   meta.mixSafely(meta, {
     MetaContext: MetaContext,
     create: create
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/modify.js b/src/modify.js
index 3b61483..c7cb28f 100644
--- a/src/modify.js
+++ b/src/modify.js
@@ -1,32 +1,29 @@
-/** modify.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/modify.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
-  
+!function(meta) {
+
+  'use strict'
+
   /**
    * @mixin Modifiable
    */
@@ -55,11 +52,11 @@
      */
     this.modify = function(modifier) {
       if (!(type instanceof modifier.substrate))
-        throw new meta.exception.InvalidTemplateException();
-      modifier.modify(this);
-      return this;
-    };
-  };
+        throw new meta.exception.InvalidTemplateException()
+      modifier.modify(this)
+      return this
+    }
+  }
 
   /**
    * @mixin Modifier
@@ -76,7 +73,7 @@
    *  modify.
    */
   var Modifier = function(substrate) {
-    this.substrate = substrate;
+    this.substrate = substrate
 
     /**
      * @method modify
@@ -91,13 +88,13 @@
      *  A Modifiable object to alter.
      */
     this.modify = function(modifiable) {
-      throw new meta.exception.InvokedAbstractMethodException();
-    };
-  };
+      throw new meta.exception.InvokedAbstractMethodException()
+    }
+  }
 
   meta.mixSafely(meta, {
     Modifiable: Modifiable,
     Modifier: Modifier
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/process.js b/src/process.js
deleted file mode 100644
index 5d06562..0000000
--- a/src/process.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/** process.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
- * 
- *      This file is part of Meta2D.
- *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
- *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
- *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
- *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
-
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
-
-  var processes = {};
-
-  /** Start a new process running, or return an existing one. */
-  var process = function(name, f, rate) {
-    if (meta.undef(name))
-      throw new meta.exception.InvalidParameterException();
-    if (!f || meta.undef(rate))
-      return processes[name];
-
-    var fps_timeout_id,
-        fps_time = meta.time(),
-        fps_rate,
-        fps_count;
-
-    // The function to repeat
-    // #process controller
-    var recurrence = function (f, rate) {
-      var ms = meta.time();
-
-      fps_count++;
-      if (ms - fps_time > 1000) {
-        fps_rate = fps_count;
-        fps_count = 0;
-        fps_time = ms;
-      }
-      f.call(this);
-
-      var t_pct = (ms - fps_time) / 1000,
-          c_pct = fps_count / rate;
-
-      if (c_pct < t_pct) {
-        fps_timeout_id = setTimeout(this.start.bind(this), 0);
-      } else {
-        fps_timeout_id = setTimeout(this.start.bind(this), 1000 / rate);
-      }
-    };
-
-    // Process controller
-    var obj = {
-      getTimeoutId: function() {
-        return fps_timeout_id;
-      },
-      stop: function() {
-        cleartimeout(fps_timeout_id);
-      },
-      start: function() {
-        recurrence.call(this, params.f, params.rate);
-        return this;
-      },
-      getRate: function() {
-        return fps_rate;
-      }
-    };
-
-    // store & return new obj
-    if (processes[name]) processes[name].stop();
-    processes[name] = obj;
-    return obj.start.call(obj);
-  };
-
-
-  // #[meta2d::Context]
-  var render = function() {
-    this.clearAll();
-    this.renderAll();
-    this.flipAll();
-  };
-
-  meta.process = meta.declareSafely(meta.process, {
-    process: process,
-    render: render
-  });
-
-}).call(this);
diff --git a/src/projection.js b/src/projection.js
index 420acbc..9fda42d 100644
--- a/src/projection.js
+++ b/src/projection.js
@@ -1,31 +1,28 @@
-/** projection.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/projection.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   /**
    * @class Projection
@@ -52,8 +49,8 @@
    *  methods.
    */
   var Projection = function() {
-    meta.Modifiable.call(this, new meta.ProjectionType());
-  };
+    meta.Modifiable.call(this, new meta.ProjectionType())
+  }
 
   /**
    * @method forward
@@ -69,8 +66,8 @@
    * @return Array<<Number>>
    */
   Projection.prototype.forward = function(v) {
-    throw new meta.exception.InvokedAbstractMethodException();
-  };
+    throw new meta.exception.InvokedAbstractMethodException()
+  }
 
   /**
    * @method reverse
@@ -86,105 +83,105 @@
    * @return Array<<Number>>
    */
   Projection.prototype.reverse = function(v) {
-    throw new meta.exception.InvokedAbstractMethodException();
-  };
+    throw new meta.exception.InvokedAbstractMethodException()
+  }
 
   // @return [meta2d::Projection]
   var flat = function() {
-    var o = function() {};
+    var o = function() {}
 
-    o.prototype = new Projection();
+    o.prototype = new Projection()
     o.prototype.forward = function(v) {
-      return v;
-    };
+      return v
+    }
     o.prototype.reverse = function(v) {
-      return v;
-    };
+      return v
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Projection]
   var iso_from_2d = function(w, h) {
-    if (!w || !h) throw new meta.exception.InvalidParameterException();
-    var o = function() {};
+    if (!w || !h) throw new meta.exception.InvalidParameterException()
+    var o = function() {}
 
-    o.prototype = new Projection();
+    o.prototype = new Projection()
     o.prototype.forward = function(v) {
       return [
         (v[0] - v[1]) * 0.5 * w,
         (v[1] + v[0]) * 0.5 * h
-      ];
-    };
+      ]
+    }
     o.prototype.reverse = function(v) {
       var a = 2 * v[0] / w,
           b = 2 * v[1] / h,
           x = (a + b) / 2,
-          y = b - x;
-      return [x, y];
-    };
+          y = b - x
+      return [x, y]
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.ProjectionType>]
   var shift = function(v_shift) {
     var o = function() {
-      meta.Modifier.call(this, meta.ProjectionType);
+      meta.Modifier.call(this, meta.ProjectionType)
       this.modify = function(projection) {
-        projection.forward = this.wrapForward(projection.forward);
-        projection.reverse = this.wrapReverse(projection.reverse);
-      };
-    };
+        projection.forward = this.wrapForward(projection.forward)
+        projection.reverse = this.wrapReverse(projection.reverse)
+      }
+    }
 
     o.prototype.wrapForward = function(f) {
       return function(v) {
-        return meta.math.vector.plus(f.call(this, v), v_shift);
-      };
-    };
+        return meta.math.vector.plus(f.call(this, v), v_shift)
+      }
+    }
     o.prototype.wrapReverse = function(f) {
       return function(v) {
-        return f.call(this, meta.math.vector.minus(v, v_shift));
-      };
-    };
+        return f.call(this, meta.math.vector.minus(v, v_shift))
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.ProjectionType>]
   var scale = function(v_scale) {
     var o = function() {
-      meta.Modifier.call(this, meta.ProjectionType);
+      meta.Modifier.call(this, meta.ProjectionType)
       this.modify = function(projection) {
-        projection.forward = this.wrapForward(projection.forward);
-        projection.reverse = this.wrapReverse(projection.reverse);
-      };
-    };
+        projection.forward = this.wrapForward(projection.forward)
+        projection.reverse = this.wrapReverse(projection.reverse)
+      }
+    }
 
     o.prototype.wrapForward = function(f) {
       return function(v) {
-        return meta.math.vector.mult(f.call(this, v), v_scale);
-      };
-    };
+        return meta.math.vector.mult(f.call(this, v), v_scale)
+      }
+    }
     o.prototype.wrapReverse = function(f) {
       return function(v) {
         return f.call(this, meta.math.vector.mult(
-              v, meta.math.vector.invert(v_scale)));
-      };
-    };
+              v, meta.math.vector.invert(v_scale)))
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   meta.mixSafely(meta, {
     Projection: Projection
-  });
+  })
 
   meta.projection = meta.declareSafely(meta.projection, {
     flat: flat,
     iso2d: iso_from_2d,
     shift: shift,
     scale: scale
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/rcache.js b/src/rcache.js
index bc151bb..58a6549 100644
--- a/src/rcache.js
+++ b/src/rcache.js
@@ -1,35 +1,32 @@
-/** rcache.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/rcache.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   var datum_val = function(datum) {
-    return datum.val;
-  };
+    return datum.val
+  }
 
   /**
    * @class RCache
@@ -48,7 +45,7 @@
   var RCache = function(capacity) {
     var rcache_ = this,
         rtree_ = new meta.RTree(4),
-        lru_ = new meta.LRU(capacity || 16);
+        lru_ = new meta.LRU(capacity || 16)
 
     /**
      * @method add
@@ -75,13 +72,13 @@
      * @return Array
      */
     this.add = function(rect, val) {
-      var key = meta.serialize(rect);
+      var key = meta.serialize(rect)
 
       // Only proceed if key is not present in cache.
-      if (lru_.get(key)) return [];
+      if (lru_.get(key)) return []
 
-      return this.update(rect, val);
-    };
+      return this.update(rect, val)
+    }
 
     /**
      * @method get
@@ -100,12 +97,12 @@
      * @return Object
      */
     this.get = function(rect) {
-      var datum = lru_.get(meta.serialize(rect));
+      var datum = lru_.get(meta.serialize(rect))
 
-      if (!datum) return null;
+      if (!datum) return null
 
-      return datum.val;
-    };
+      return datum.val
+    }
 
     /**
      * @method update
@@ -134,19 +131,19 @@
       var key = meta.serialize(rect),
           rect = rect.slice(0),
           datum = {rect: rect, val: val},
-          dropped = lru_.add(key, datum);
+          dropped = lru_.add(key, datum)
 
       // Make sure any dropped data are removed from the rtree.
       dropped.forEach(function(d) {
-          rtree_.find(d.rect, true);
-          });
+          rtree_.find(d.rect, true)
+          })
 
       // Update the rtree by removing old rect
-      rtree_.find(rect, true);
-      rtree_.insert(rect, datum);
+      rtree_.find(rect, true)
+      rtree_.insert(rect, datum)
 
-      return dropped.map(datum_val);
-    };
+      return dropped.map(datum_val)
+    }
 
     /**
      * @method pluck
@@ -164,12 +161,12 @@
      * @return Array[1]
      */
     this.pluck = function(rect) {
-      var hit = lru_.pluck(meta.serialize(rect));
+      var hit = lru_.pluck(meta.serialize(rect))
 
-      rtree_.find(rect, true);
+      rtree_.find(rect, true)
 
-      return [hit].map(datum_val);
-    };
+      return [hit].map(datum_val)
+    }
 
     /**
      * @method pluckInside
@@ -188,14 +185,14 @@
      * @return Array
      */
     this.pluckInside = function(rect) {
-      var hits = rtree_.searchInside(rect, true);
+      var hits = rtree_.searchInside(rect, true)
 
       hits.forEach(function(d) {
           lru_.pluck(meta.serialize(d.rect))
-          });
+          })
 
-      return hits.map(datum_val);
-    };
+      return hits.map(datum_val)
+    }
 
     /**
      * @method pluckOutside
@@ -214,14 +211,14 @@
      * @return Array
      */
     this.pluckOutside = function(rect) {
-      var hits = rtree_.searchOutside(rect, true);
+      var hits = rtree_.searchOutside(rect, true)
 
       hits.forEach(function(d) {
-          lru_.pluck(meta.serialize(d.rect));
-          });
+          lru_.pluck(meta.serialize(d.rect))
+          })
 
-      return hits.map(datum_val);
-    };
+      return hits.map(datum_val)
+    }
 
     /**
      * @method search
@@ -239,14 +236,14 @@
      * @return Array
      */
     this.search = function(rect) {
-      var hits = rtree_.search(rect);
+      var hits = rtree_.search(rect)
 
       hits.forEach(function(d) {
-          lru_.update(meta.serialize(d.rect), d.val);
-          });
+          lru_.update(meta.serialize(d.rect), d.val)
+          })
 
-      return hits.map(datum_val);
-    };
+      return hits.map(datum_val)
+    }
 
     /**
      * @method searchInside
@@ -265,14 +262,14 @@
      * @return Array
      */
     this.searchInside = function(rect) {
-      var hits = rtree_.searchInside(rect);
+      var hits = rtree_.searchInside(rect)
 
       hits.forEach(function(d) {
-          lru_.update(meta.serialize(d.rect), d.val);
-          });
+          lru_.update(meta.serialize(d.rect), d.val)
+          })
 
-      return hits.map(datum_val);
-    };
+      return hits.map(datum_val)
+    }
 
     /**
      * @method searchOutside
@@ -291,17 +288,17 @@
      * @return Array
      */
     this.searchOutside = function(rect) {
-      var hits = rtree_.searchOutside(rect);
+      var hits = rtree_.searchOutside(rect)
 
       hits.forEach(function(d) {
-          lru_.update(meta.serialize(d.rect), d.val);
-          });
+          lru_.update(meta.serialize(d.rect), d.val)
+          })
 
-      return hits.map(datum_val);
-    };
+      return hits.map(datum_val)
+    }
 
-  };
+  }
 
-  meta.mixSafely(meta, {RCache: RCache});
+  meta.mixSafely(meta, {RCache: RCache})
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/rtree.js b/src/rtree.js
index a820209..e7ba998 100644
--- a/src/rtree.js
+++ b/src/rtree.js
@@ -1,67 +1,64 @@
-/** rtree.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/rtree.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var rect = meta.math.rect;
+  var rect = meta.math.rect
 
   var expand = function(rect1, rect2) {
     var l1 = rect1[0], l2 = rect2[0],
         t1 = rect1[1], t2 = rect2[1],
         r1 = rect1[0] + rect1[2], r2 = rect2[0] + rect2[2],
-        b1 = rect1[1] + rect1[3], b2 = rect2[1] + rect2[3];
+        b1 = rect1[1] + rect1[3], b2 = rect2[1] + rect2[3]
     var top = Math.min(t1, t2),
         bottom = Math.max(b1, b2),
         right = Math.max(r1, r2),
-        left = Math.min(l1, l2);
+        left = Math.min(l1, l2)
     return [
       left,
       top,
       right - left,
       bottom - top
-    ];
-  };
+    ]
+  }
 
   var least_expansion = function(children, rect) {
     var expanded = children.map(function(node) {
         return {
           newrect: expand(node.rect, rect),
           noderef: node
-        };
-        });
+        }
+        })
     var bestnode = expanded.sort(function(n1 ,n2) {
         return meta.math.rect.area(n1.newrect) -
-               meta.math.rect.area(n2.newrect);
-        })[0];
+               meta.math.rect.area(n2.newrect)
+        })[0]
     return {
       child: bestnode.noderef,
       rect: bestnode.newrect
-    };
-  };
+    }
+  }
 
   /**
    * @class RTree
@@ -77,10 +74,10 @@
    *  </p>
    */
   var RTree = function (capacity) {
-    this.children; // [{rtree, rect}], not kept by leaf nodes
-    this.data; // [{object, rect}], only kept by leaf nodes
-    this.capacity = capacity || 3;
-  };
+    this.children // [{rtree, rect}], not kept by leaf nodes
+    this.data // [{object, rect}], only kept by leaf nodes
+    this.capacity = capacity || 3
+  }
 
   /**
    * @method query
@@ -104,28 +101,32 @@
    */
   RTree.prototype.query = function(f, remove) {
     var hits = [],
-        merged = [];
+        merged = []
 
     if (this.data) {
       this.data.forEach(function(d, idx, array) {
-          if (!f.call(void 0, d.rect)) return;
-          hits.push(d.object);
-          if (remove) array[idx] = void 0;
-          });
-      if (remove) this.data = this.data.filter(meta.def);
-      return hits;
+          if (!f.call(void 0, d.rect)) {
+            return null
+          }
+          hits.push(d.object)
+          if (remove) array[idx] = void 0
+          })
+      if (remove) this.data = this.data.filter(meta.def)
+      return hits
     }
 
     if (!this.children)
-      return [];
+      return []
 
     this.children.forEach(function(c) {
-        if (!f.call(void 0, c.rect)) return;
-        merged = merged.concat(c.rtree.query(f, remove));
-        });
+        if (!f.call(void 0, c.rect)) {
+          return null
+        }
+        merged = merged.concat(c.rtree.query(f, remove))
+        })
 
-    return merged;
-  };
+    return merged
+  }
 
   /**
    * @method search
@@ -144,10 +145,10 @@
    */
   RTree.prototype.search = function(rect, remove) {
     var f = function(r) {
-      return meta.math.rect.intersect(r, rect);
-    };
-    return this.query(f, remove);
-  };
+      return meta.math.rect.intersect(r, rect)
+    }
+    return this.query(f, remove)
+  }
 
   /**
    * @method find
@@ -166,10 +167,10 @@
    */
   RTree.prototype.find = function(rect, remove) {
     var f = function(r) {
-      return meta.math.rect.equal(r, rect);
-    };
-    return this.query(f, remove);
-  };
+      return meta.math.rect.equal(r, rect)
+    }
+    return this.query(f, remove)
+  }
 
   /**
    * @method searchInside
@@ -188,10 +189,10 @@
    */
   RTree.prototype.searchInside = function(rect, remove) {
     var f = function(r) {
-      return meta.math.rect.containedBy(r, rect);
-    };
-    return this.query(f, remove);
-  };
+      return meta.math.rect.containedBy(r, rect)
+    }
+    return this.query(f, remove)
+  }
 
   /**
    * @method searchOutside
@@ -210,10 +211,10 @@
    */
   RTree.prototype.searchOutside = function(rect, remove) {
     var f = function(r) {
-      return !meta.math.rect.intersect(r, rect);
-    };
-    return this.query(f, remove);
-  };
+      return !meta.math.rect.intersect(r, rect)
+    }
+    return this.query(f, remove)
+  }
 
   /**
    * @method insert
@@ -241,17 +242,17 @@
   RTree.prototype.insert = function(rect, object) {
     // Defer to child that needs least expansion of its bounds.
     if (this.children) {
-      var best = least_expansion(this.children, rect);
-      best.child.rect = best.rect;
-      return best.child.rtree.insert(rect, object);
+      var best = least_expansion(this.children, rect)
+      best.child.rect = best.rect
+      return best.child.rtree.insert(rect, object)
     }
 
     // Add new data.
-    this.data = this.data || [];
+    this.data = this.data || []
     this.data.push({
         rect: rect,
         object: object
-        });
+        })
 
     // Expand if capacity reached, and distribute data among children.
     if (this.data.length >= this.capacity) {
@@ -260,25 +261,20 @@
             var child = {
               rtree: new meta.RTree(rtree.capacity),
               rect: rtree.data[i].rect
-            };
+            }
 
-            child.rtree.insert(rtree.data[i].rect, rtree.data[i].object);
-            rtree.children = rtree.children || [];
-            rtree.children.push(child);
-          };
+            child.rtree.insert(rtree.data[i].rect, rtree.data[i].object)
+            rtree.children = rtree.children || []
+            rtree.children.push(child)
+          }
 
       this.data.forEach(function(d, i) {
-          move_datum(i);
-          });
-      this.data = undefined;
-
-      return;
+          move_datum(i)
+          })
+      this.data = undefined
     }
+  }
 
-    // Tree was unchanged.
-    return;
-  };
-
-  meta.mixSafely(meta, {RTree: RTree});
+  meta.mixSafely(meta, {RTree: RTree})
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/segment.js b/src/segment.js
index 3b90a16..1100ecb 100644
--- a/src/segment.js
+++ b/src/segment.js
@@ -1,79 +1,76 @@
-/** segment.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/segment.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   var segment = function(start, end) {
     if (meta.undef(start))
-      start = Number.NEGATIVE_INFINITY;
+      start = Number.NEGATIVE_INFINITY
     if (meta.undef(end))
-      end = Number.POSITIVE_INFINITY;
-    return [start, end];
-  };
+      end = Number.POSITIVE_INFINITY
+    return [start, end]
+  }
 
   var start = function(seg) {
-    return seg[0];
-  };
+    return seg[0]
+  }
 
   var end = function(seg) {
-    return seg[1];
-  };
+    return seg[1]
+  }
 
   var is_forward = function(seg) {
-    return start(seg) <= end(seg);
-  };
+    return start(seg) <= end(seg)
+  }
 
   var reverse = function(seg) {
-    return [seg[1], seg[0]];
-  };
+    return [seg[1], seg[0]]
+  }
 
   // inclusive at start, exclusive at end
   var includes = function(seg) {
-    var queries = meta.args(arguments).slice(1);
+    var queries = meta.args(arguments).slice(1)
 
     return queries.every(function(q) {
         return is_forward(seg) ?
           q >= start(seg) && q < end(seg) :
-          q <= start(seg) && q > end(seg);
-          });
-  };
+          q <= start(seg) && q > end(seg)
+          })
+  }
 
   var intersects = function(seg) {
-    var segs = meta.args(arguments).slice(1);
+    var segs = meta.args(arguments).slice(1)
 
     return segs.every(function(s) {
         return includes(seg, start(s))
-            || includes(seg, end(s));
-        });
-  };
+            || includes(seg, end(s))
+        })
+  }
 
   var always = function() {
-    return segment();
-  };
+    return segment()
+  }
 
   meta.segment = meta.declareSafely(meta.segment, {
     segment: segment,
@@ -84,6 +81,6 @@
     reverse: reverse,
     includes: includes,
     intersects: intersects
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/tween.js b/src/tween.js
index cd864ce..8ecb93e 100644
--- a/src/tween.js
+++ b/src/tween.js
@@ -1,33 +1,32 @@
-/** tween.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/tween.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this,
-      meta = root.meta2d,
-      segment = meta.segment;
+!function(meta) {
+
+  'use strict'
 
-  var no_frame = function() {return {};};
+  var segment = meta.segment
+
+  var no_frame = function() {return {}}
 
   /**
    * @class Tween
@@ -46,8 +45,8 @@
    *  </p>
    */
   var Tween = function() {
-    meta.Modifiable.call(this, new meta.TweenType());
-  };
+    meta.Modifiable.call(this, new meta.TweenType())
+  }
 
   /**
    * @method fix
@@ -73,232 +72,232 @@
    * @return Function
    */
   Tween.prototype.fix = function() {
-    throw new meta.exception.InvokedAbstractMethodException();
-  };
+    throw new meta.exception.InvokedAbstractMethodException()
+  }
 
-  meta.mixSafely(meta, {Tween: Tween});
+  meta.mixSafely(meta, {Tween: Tween})
 
   // @return [meta2d::Tween]
   var constant = function(attr, value) {
-    var o = function() {};
+    var o = function() {}
 
-    o.prototype = new Tween();
+    o.prototype = new Tween()
     o.prototype.fix = function(seg, f1, f2) {
-      var args = arguments;
+      var args = arguments
 
       return function(t) {
-        if (!segment.includes(seg, t)) return no_frame();
-        var f = {};
+        if (!segment.includes(seg, t)) return no_frame()
+        var f = {}
 
         if (meta.def(value)) {
-          f[attr] = value;
+          f[attr] = value
         } else {
-          if (args.length < 3) return no_frame();
-          f[attr] = segment.isForward(seg) ? f1[attr] : f2[attr];
+          if (args.length < 3) return no_frame()
+          f[attr] = segment.isForward(seg) ? f1[attr] : f2[attr]
         }
 
-        return f;
-      };
-    };
+        return f
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Tween]
   var linear = function(attr) {
-    var o = function() {};
+    var o = function() {}
 
-    o.prototype = new Tween();
+    o.prototype = new Tween()
     o.prototype.fix = function(seg, f1, f2) {
-      if (arguments.length < 3) return no_frame;
+      if (arguments.length < 3) return no_frame
       return function(t) {
-        if (!segment.includes(seg, t)) return no_frame();
+        if (!segment.includes(seg, t)) return no_frame()
         var f = {},
             sv = f1[attr],
             ev = f2[attr],
             p = (t - segment.start(seg))
-              / (segment.end(seg) - segment.start(seg));
+              / (segment.end(seg) - segment.start(seg))
 
-        f[attr] = ((1 - p) * sv) + (p * ev);
+        f[attr] = ((1 - p) * sv) + (p * ev)
 
-        return f;
-      };
-    };
+        return f
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Tween]
   var variant = function(attr, func) {
-    var o = function() {};
+    var o = function() {}
 
-    o.prototype = new Tween();
+    o.prototype = new Tween()
     o.prototype.fix = function() {
       return function(t) {
-        var f = {};
+        var f = {}
 
-        f[attr] = func(t);
+        f[attr] = func(t)
 
-        return f;
-      };
-    };
+        return f
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Tween]
   var invariant = function(attr, func) {
-    var o = function() {};
+    var o = function() {}
     
-    o.prototype = new Tween();
+    o.prototype = new Tween()
     o.prototype.fix = function() {
       return function() {
-        var f = {};
+        var f = {}
 
-        f[attr] = func();
+        f[attr] = func()
 
-        return f;
-      };
-    };
+        return f
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   var step = function(t) {
-    return t >= 0 ? 1: 0;
-  };
+    return t >= 0 ? 1: 0
+  }
 
   var sine = function(t) {
-    return Math.sin(t);
-  };
+    return Math.sin(t)
+  }
 
   var square = function(t) {
-    return Math.sin(t) >= 0 ? 1 : -1;
-  };
+    return Math.sin(t) >= 0 ? 1 : -1
+  }
 
   // @return [meta2d::Modifier<meta2d.TweenType>]
   var shift = function(val) {
     var o = function() {
-      meta.Modifier.call(this, meta.TweenType);
+      meta.Modifier.call(this, meta.TweenType)
       this.modify = function(tween) {
-        tween.fix = this.wrap(tween.fix);
-      };
-    };
+        tween.fix = this.wrap(tween.fix)
+      }
+    }
 
     o.prototype.wrap = function(f) {
       // #[meta2d::Context]
       return function() {
-        var fixed = f.apply(this, arguments);
+        var fixed = f.apply(this, arguments)
         return function(t) {
-          return fixed(t + val);
-        };
-      };
-    };
+          return fixed(t + val)
+        }
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.TweenType>]
   var reverse = function() {
     var o = function() {
-      meta.Modifier.call(this, meta.TweenType);
+      meta.Modifier.call(this, meta.TweenType)
       this.modify = function(tween) {
-        tween.fix = this.wrap(tween.fix);
-      };
-    };
+        tween.fix = this.wrap(tween.fix)
+      }
+    }
 
     o.prototype.wrap = function(f) {
       // #[meta2d::Context]
       return function() {
-        var fixed = f.apply(this, arguments);
+        var fixed = f.apply(this, arguments)
         return function(t) {
-          return fixed(-t);
-        };
-      };
-    };
+          return fixed(-t)
+        }
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.TweenType>]
   var offset = function(attr, val) {
     var o = function() {
-      meta.Modifier.call(this, meta.TweenType);
+      meta.Modifier.call(this, meta.TweenType)
       this.modify = function(tween) {
-        tween.fix = this.wrap(tween.fix);
-      };
-    };
+        tween.fix = this.wrap(tween.fix)
+      }
+    }
 
     o.prototype.wrap = function(f) {
       // #[meta2d::Context]
       return function() {
-        var fixed = f.apply(this, arguments);
+        var fixed = f.apply(this, arguments)
         return function(t) {
-          var frame = fixed(t);
+          var frame = fixed(t)
 
-          frame[attr] += val;
+          frame[attr] += val
 
-          return frame;
-        };
-      };
-    };
+          return frame
+        }
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.TweenType>]
   var scale = function(attr, val) {
     var o = function() {
-      meta.Modifier.call(this, meta.TweenType);
+      meta.Modifier.call(this, meta.TweenType)
       this.modify = function(tween) {
-        tween.fix = this.wrap(tween.fix);
-      };
-    };
+        tween.fix = this.wrap(tween.fix)
+      }
+    }
 
     o.prototype.wrap = function(f) {
       // #[meta2d::Context]
       return function() {
-        var fixed = f.apply(this, arguments);
+        var fixed = f.apply(this, arguments)
         return function(t) {
-          var frame = fixed(t);
+          var frame = fixed(t)
 
-          frame[attr] *= val;
+          frame[attr] *= val
 
-          return frame;
-        };
-      };
-    };
+          return frame
+        }
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   // @return [meta2d::Modifier<meta2d.TweenType>]
   var limit = function(attr, lower, upper) {
-    if (upper < lower) throw new meta.exception.InvalidParameterException();
+    if (upper < lower) throw new meta.exception.InvalidParameterException()
     var o = function() {
-      meta.Modifier.call(this, meta.TweenType);
+      meta.Modifier.call(this, meta.TweenType)
       this.modify = function(tween) {
-        tween.fix = this.wrap(tween.fix);
-      };
-    };
+        tween.fix = this.wrap(tween.fix)
+      }
+    }
 
     o.prototype.wrap = function(f) {
       // #[meta2d::Context]
       return function() {
-        var fixed = f.apply(this, arguments);
+        var fixed = f.apply(this, arguments)
         return function(t) {
-          var frame = fixed(t);
+          var frame = fixed(t)
 
-          if (meta.def(lower)) frame[attr] = Math.max(lower, frame[attr]);
-          if (meta.def(upper)) frame[attr] = Math.min(upper, frame[attr]);
+          if (meta.def(lower)) frame[attr] = Math.max(lower, frame[attr])
+          if (meta.def(upper)) frame[attr] = Math.min(upper, frame[attr])
 
-          return frame;
-        };
-      };
-    };
+          return frame
+        }
+      }
+    }
 
-    return new o();
-  };
+    return new o()
+  }
 
   meta.tween = meta.declareSafely(meta.tween, {
     constant: constant,
@@ -308,7 +307,7 @@
     step: step,
     sine: sine,
     square: square
-  });
+  })
   
   meta.modifier = meta.declareSafely(meta.modifier, {
     shift: shift,
@@ -316,6 +315,6 @@
     offset: offset,
     scale: scale,
     limit: limit
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/ui/button.js b/src/ui/button.js
index 36bfd4c..956fea6 100644
--- a/src/ui/button.js
+++ b/src/ui/button.js
@@ -1,36 +1,33 @@
-/** button.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/ui/button.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var proto = {};
+  var proto = {}
 
   proto.ondraw = function(cx, layer) {
-    cx.font = this.font || '14px sans';
+    cx.font = this.font || '14px sans'
     var m = cx.measureText(this.value).width,
         padding = 5,
         w = (this.size && this.size[0]) || m + 2 * padding,
@@ -43,57 +40,57 @@
         fontcolor = sel ? 'white' : '#444',
         bordercolor = sel
           ? this.focused ? '#444' : '#444'
-          : this.focused ? '#444' : '#ccc';
+          : this.focused ? '#444' : '#ccc'
 
-    grad.addColorStop(sel ? 1 : 0, meta.hsl(240, sat, lum + 10));
-    grad.addColorStop(sel ? 0 : 1, meta.hsl(240, sat, lum));
+    grad.addColorStop(sel ? 1 : 0, meta.hsl(240, sat, lum + 10))
+    grad.addColorStop(sel ? 0 : 1, meta.hsl(240, sat, lum))
 
-    ctx.font = '14px sans';
-    ctx.lineWidth = 1;
-    ctx.strokeStyle = bordercolor;
-    ctx.fillStyle = grad;
-    ctx.fillRect(0, 0, w, h);
-    ctx.strokeRect(0, 0, w, h);
-    ctx.fillStyle = fontcolor;
-    ctx.fillText(this.value, w * 0.5 - m * 0.5, h * 0.7);
+    ctx.font = '14px sans'
+    ctx.lineWidth = 1
+    ctx.strokeStyle = bordercolor
+    ctx.fillStyle = grad
+    ctx.fillRect(0, 0, w, h)
+    ctx.strokeRect(0, 0, w, h)
+    ctx.fillStyle = fontcolor
+    ctx.fillText(this.value, w * 0.5 - m * 0.5, h * 0.7)
 
-    this.draw = layer.makeDrawing(ctx);
+    this.draw = layer.makeDrawing(ctx)
 
     if (this.align === 'v') {
-      this.offset = [this.draw.getBounds()[2], 0];
+      this.offset = [this.draw.getBounds()[2], 0]
     } else if (this.align === 'h') {
-      this.offset = [0, this.draw.getBounds()[3]];
+      this.offset = [0, this.draw.getBounds()[3]]
     }
 
-    return this.draw;
-  };
+    return this.draw
+  }
 
   proto.onmask = function() {
-    if (this.draw) return this.mask = meta.mask.opaque(this.draw);
-  };
+    if (this.draw) return this.mask = meta.mask.opaque(this.draw)
+  }
 
   proto.onmouseover = function() {
-    this.focused = true;
-    this.layer.repaint(this);
-  };
+    this.focused = true
+    this.layer.repaint(this)
+  }
 
   proto.onmouseout = function() {
-    this.focused = false;
-    this.layer.repaint(this);
-  };
+    this.focused = false
+    this.layer.repaint(this)
+  }
 
-  proto.cursor = 'pointer';
+  proto.cursor = 'pointer'
 
-  meta.ui = meta.declareSafely(meta.ui);
+  meta.ui = meta.declareSafely(meta.ui)
 
   meta.ui.proto = meta.declareSafely(meta.ui.proto, {
     button: proto
-  });
+  })
 
   meta.ui = meta.declareSafely(meta.ui, {
     button: function(e) {
-      return meta.mixSafely(e, meta.ui.proto.button);
+      return meta.mixSafely(e, meta.ui.proto.button)
     }
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/ui/draggable.js b/src/ui/draggable.js
index e10a179..137195c 100644
--- a/src/ui/draggable.js
+++ b/src/ui/draggable.js
@@ -1,55 +1,52 @@
-/** draggable.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/ui/draggable.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var proto = {};
+  var proto = {}
 
   proto.onmask = function() {
-    if (this.draw) return this.mask = meta.mask.opaque(this.draw);
-  };
+    if (this.draw) return this.mask = meta.mask.opaque(this.draw)
+  }
 
   proto.ondrag = function(x, y, dx, dy) {
-    this.pos = meta.math.vector.plus(this.pos, [dx, dy]);
-    delete this.mask;
-    delete this.draw;
-    this.layer.repaint(this);
-  };
+    this.pos = meta.math.vector.plus(this.pos, [dx, dy])
+    delete this.mask
+    delete this.draw
+    this.layer.repaint(this)
+  }
 
-  meta.ui = meta.declareSafely(meta.ui);
+  meta.ui = meta.declareSafely(meta.ui)
 
   meta.ui.proto = meta.declareSafely(meta.ui.proto, {
     draggable: proto
-  });
+  })
 
   meta.ui = meta.declareSafely(meta.ui, {
     draggable: function(e) {
-      return meta.mixSafely(e, meta.ui.proto.draggable);
+      return meta.mixSafely(e, meta.ui.proto.draggable)
     }
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/ui/progress.js b/src/ui/progress.js
index 9defbe3..19c193a 100644
--- a/src/ui/progress.js
+++ b/src/ui/progress.js
@@ -1,70 +1,67 @@
-/** progress.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/ui/progress.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var proto = {};
+  var proto = {}
 
   proto.ondraw = function(cx, layer) {
-    cx.font = this.font || '14px sans';
+    cx.font = this.font || '14px sans'
     var w = this.size[0] || 100,
         h = this.size[1] || 24,
         ctx = new meta.Context(w, h),
         sat = 50,
         hue = 120,
-        grad = ctx.createLinearGradient(0, 0, 0, h);
+        grad = ctx.createLinearGradient(0, 0, 0, h)
 
-    grad.addColorStop(0.0, meta.hsl(hue, sat, 90));
-    grad.addColorStop(0.2, meta.hsl(hue, sat, 65));
-    grad.addColorStop(0.5, meta.hsl(hue, sat, 75));
-    grad.addColorStop(1.0, meta.hsl(hue, sat, 65));
+    grad.addColorStop(0.0, meta.hsl(hue, sat, 90))
+    grad.addColorStop(0.2, meta.hsl(hue, sat, 65))
+    grad.addColorStop(0.5, meta.hsl(hue, sat, 75))
+    grad.addColorStop(1.0, meta.hsl(hue, sat, 65))
 
-    ctx.font = cx.font;
-    ctx.lineWidth = 1;
-    ctx.strokeStyle = '#888';
-    ctx.fillStyle = grad;
-    ctx.fillRect(0, 0, w * this.value/100, h);
-    ctx.strokeRect(0, 0, w, h);
-    ctx.fillStyle = '#444';
-    ctx.fillText((this.value << 0) + '%', 4, h * 0.7);
+    ctx.font = cx.font
+    ctx.lineWidth = 1
+    ctx.strokeStyle = '#888'
+    ctx.fillStyle = grad
+    ctx.fillRect(0, 0, w * this.value/100, h)
+    ctx.strokeRect(0, 0, w, h)
+    ctx.fillStyle = '#444'
+    ctx.fillText((this.value << 0) + '%', 4, h * 0.7)
 
-    return this.draw = layer.makeDrawing(ctx);
-  };
+    return this.draw = layer.makeDrawing(ctx)
+  }
 
-  meta.ui = meta.declareSafely(meta.ui);
+  meta.ui = meta.declareSafely(meta.ui)
 
   meta.ui.proto = meta.declareSafely(meta.ui.proto, {
     progress: proto
-  });
+  })
 
   meta.ui = meta.declareSafely(meta.ui, {
     progress: function(e) {
-      return meta.mixSafely(e, meta.ui.proto.progress);
+      return meta.mixSafely(e, meta.ui.proto.progress)
     }
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/ui/selectable.js b/src/ui/selectable.js
index 56e956f..a7bdc22 100644
--- a/src/ui/selectable.js
+++ b/src/ui/selectable.js
@@ -1,73 +1,72 @@
-/** selectable.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/ui/selectable.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
-  var proto = {};
+  var proto = {}
 
   proto.onmask = function() {
-    if (this.draw) return this.mask = meta.mask.opaque(this.draw);
-  };
+    if (this.draw) return this.mask = meta.mask.opaque(this.draw)
+  }
 
   proto.onmousedown = function() {
-    this.selecting = true;
+    this.selecting = true
     if (!this.selected && this.onselecting) {
-      this.onselecting.call(this);
+      this.onselecting.call(this)
     } else if (this.onunselecting) {
-      this.onunselecting.call(this);
+      this.onunselecting.call(this)
     }
-    this.layer.repaint(this);
-  };
+    this.layer.repaint(this)
+  }
 
   proto.onmouseup = function() {
-    if (!this.selecting) return;
-    this.selecting = false;
+    if (!this.selecting) {
+      return null
+    }
+    this.selecting = false
 
-    this.selected = !this.selected;
+    this.selected = !this.selected
     if (this.selected && this.onselected) {
-      this.onselected.call(this);
+      this.onselected.call(this)
     } else if (this.onunselected) {
-      this.onunselected.call(this);
+      this.onunselected.call(this)
     }
-    this.layer.repaint(this);
-  };
+    this.layer.repaint(this)
+  }
 
   // TODO: handle mouseup outside of entity
 
-  meta.ui = meta.declareSafely(meta.ui);
+  meta.ui = meta.declareSafely(meta.ui)
 
   meta.ui.proto = meta.declareSafely(meta.ui.proto, {
     selectable: proto
-  });
+  })
 
   meta.ui = meta.declareSafely(meta.ui, {
     selectable: function(e) {
-      return meta.mixSafely(e, meta.ui.proto.selectable);
+      return meta.mixSafely(e, meta.ui.proto.selectable)
     }
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/src/ui/text.js b/src/ui/text.js
index d1aa0c1..536fe56 100644
--- a/src/ui/text.js
+++ b/src/ui/text.js
@@ -1,390 +1,389 @@
-/** text.js
- *  Copyright (c) 2011 Michael Morris-Pearce <mikemp@mit.edu>
+/* -----------------------------------------------------------------------------
+ * <https://gitorious.org/meta2d/core/trees/master/>
+ * src/ui/text.js
+ * -----------------------------------------------------------------------------
+ * Copyright 2011 Michael Morris-Pearce
  * 
- *      This file is part of Meta2D.
+ * This file is part of Meta2D.
  *
- *      Meta2D is free software: you can redistribute it and/or modify
- *      it under the terms of the GNU General Public License as published by
- *      the Free Software Foundation, either version 3 of the License, or
- *      (at your option) any later version.
+ * Meta2D is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *      Meta2D is distributed in the hope that it will be useful,
- *      but WITHOUT ANY WARRANTY; without even the implied warranty of
- *      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *      GNU General Public License for more details.
+ * Meta2D is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *      You should have received a copy of the GNU General Public License
- *      along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
- *
- *  Meta2D is hosted at <https://gitorious.org/meta2d/>. Please check there for
- *  up-to-date code, examples, documentation, and other information.
+ * You should have received a copy of the GNU General Public License
+ * along with Meta2D.  If not, see <http://www.gnu.org/licenses/>.
  *----------------------------------------------------------------------------*/
-/** jslint vars: true, white: true, indent: 2, maxlen: 80, imperfection: true */
 
-(function() {
-  'use strict';
-  var root = this;
-  var meta = root.meta2d;
-  if (!meta) throw 'Could not find main namespace.';
+!function(meta) {
+
+  'use strict'
 
   var TextArea = function() {
-    this.lines = [''];
-    this.line = 0;
-    this.cursor = 0;
-    this.mode = 'insert';
-    this.cols = 80;
-    this.maxlines = 0;
-  };
+    this.lines = ['']
+    this.line = 0
+    this.cursor = 0
+    this.mode = 'insert'
+    this.cols = 80
+    this.maxlines = 0
+  }
 
   TextArea.prototype.read = function() {
     // End of line.
     if (this.cursor >= this.lines[this.line].length) {
       // End of text.
       if (this.line === this.lines.length - 1) {
-        return null;
+        return null
       } else {
-        this.downline();
-        this.home();
-        return '\n';
+        this.downline()
+        this.home()
+        return '\n'
       }
     }
-    var c = this.lines[this.line][this.cursor];
-    this.forwardspace();
-    return c;
-  };
+    var c = this.lines[this.line][this.cursor]
+    this.forwardspace()
+    return c
+  }
 
   TextArea.prototype.readLine = function() {
     var buffer = [],
-        c;
+        c
 
     while (c = this.read()) {
-      if (c === '\n') break;
-      buffer.push(c);
+      if (c === '\n') {
+        break
+      }
+      buffer.push(c)
     }
 
-    return buffer.join('');
-  };
+    return buffer.join('')
+  }
 
   TextArea.prototype.write = function(str) {
-    if (!str) return;
+    if (!str) return
     Array.prototype.slice.call(str, 0).reduce((function(_, c) {
-      var before, after;
+      var before, after
 
       if (c === '\n') {
-        before = this.lines[this.line].slice(0, this.cursor);
-        after = this.lines[this.line].slice(this.cursor);
+        before = this.lines[this.line].slice(0, this.cursor)
+        after = this.lines[this.line].slice(this.cursor)
         if (this.lineafter()) {
-          this.home();
-          this.lines[this.line - 1] = before;
-          this.lines[this.line] = after;
+          this.home()
+          this.lines[this.line - 1] = before
+          this.lines[this.line] = after
         }
-        return 0;
+        return 0
       }
 
       if (this.lines[this.line].length < this.cols) {
         // there is room on the line for one more character.
-        before = this.lines[this.line].slice(0, this.cursor);
-        after = this.lines[this.line].slice(this.cursor);
-        this.lines[this.line] = before.concat(c).concat(after);
-        this.cursor += 1;
-        return 1;
+        before = this.lines[this.line].slice(0, this.cursor)
+        after = this.lines[this.line].slice(this.cursor)
+        this.lines[this.line] = before.concat(c).concat(after)
+        this.cursor += 1
+        return 1
       } else {
         // the line is full.
         if (this.cursor >= this.cols) {
           // we are end of line, so overflow to next line.
           if (!this.maxlines || this.lines.length < this.maxlines) {
             // just make a new line
-            this.lineafter();
-            this.home;
-            return this.write(c);
+            this.lineafter()
+            this.home
+            return this.write(c)
           } else {
             // no room for new line!
-            return 0;
+            return 0
           }
         } else {
           // there are characters after cursor.
-          after = this.lines[this.line].slice(this.cursor);
+          after = this.lines[this.line].slice(this.cursor)
         }
       }
-    }).bind(this), 0);
-  };
+    }).bind(this), 0)
+  }
 
   TextArea.prototype.writeLine = function(str) {
-    var num = this.write(str);
-    num += this.write('\n');
-    return num;
-  };
+    var num = this.write(str)
+    num += this.write('\n')
+    return num
+  }
 
   TextArea.prototype.forwarddelete = function() {
     var before, after, i,
         oldline = this.line,
-        oldcursor = this.cursor;
+        oldcursor = this.cursor
 
     if (this.cursor >= this.lines[this.line].length) {
-      if (this.line >= this.lines.length - 1) return false;
-      after = this.lines[this.line + 1].slice(0);
-      this.downline();
-      this.takeline() || this.upline();
-      this.end();
-      this.write(after);
-      this.line = oldline;
-      this.cursor = oldcursor;
-      return after.length;
+      if (this.line >= this.lines.length - 1) return false
+      after = this.lines[this.line + 1].slice(0)
+      this.downline()
+      this.takeline() || this.upline()
+      this.end()
+      this.write(after)
+      this.line = oldline
+      this.cursor = oldcursor
+      return after.length
     } else {
-      before = this.lines[this.line].slice(0, Math.max(0, this.cursor));
-      after = this.lines[this.line].slice(this.cursor + 1);
-      this.lines[this.line] = before.concat(after);
+      before = this.lines[this.line].slice(0, Math.max(0, this.cursor))
+      after = this.lines[this.line].slice(this.cursor + 1)
+      this.lines[this.line] = before.concat(after)
     }
-  };
+  }
 
   TextArea.prototype.backdelete = function() {
-    var before, after, i, oldline, oldcursor;
+    var before, after, i, oldline, oldcursor
 
     if (this.cursor <= 0) {
-      after = this.lines[this.line].slice(0);
+      after = this.lines[this.line].slice(0)
       if (this.line && (this.takeline() || this.upline())) {
-        this.end();
-        oldline = this.line;
-        oldcursor = this.cursor;
-        this.write(after);
-        this.line = oldline;
-        this.cursor = oldcursor;
+        this.end()
+        oldline = this.line
+        oldcursor = this.cursor
+        this.write(after)
+        this.line = oldline
+        this.cursor = oldcursor
       }
-      return after.length;
+      return after.length
     } else {
-      before = this.lines[this.line].slice(0, this.cursor - 1);
-      after = this.lines[this.line].slice(this.cursor);
-      this.lines[this.line] = before.concat(after);
-      this.backspace();
-      return 1;
+      before = this.lines[this.line].slice(0, this.cursor - 1)
+      after = this.lines[this.line].slice(this.cursor)
+      this.lines[this.line] = before.concat(after)
+      this.backspace()
+      return 1
     }
-  };
+  }
 
   TextArea.prototype.backspace = function() {
-    this.cursor -= 1;
+    this.cursor -= 1
     if (this.cursor < 0) {
-      this.home();
-      return false;
+      this.home()
+      return false
     }
-    return true;
-  };
+    return true
+  }
 
   TextArea.prototype.forwardspace = function() {
-    this.cursor += 1;
+    this.cursor += 1
     if (this.cursor > this.lines[this.line].length - 1) {
       //if (this.line >= this.lines.length - 1) {
-        this.end();
+        this.end()
       //}
-      return false;
+      return false
     }
-    return true;
-  };
+    return true
+  }
 
   TextArea.prototype.home = function() {
-    this.cursor = 0;
-  };
+    this.cursor = 0
+  }
 
   TextArea.prototype.end = function() {
-    this.cursor = this.lines[this.line].length;
-  };
+    this.cursor = this.lines[this.line].length
+  }
 
   TextArea.prototype.upline = function() {
-    if (!this.line) return false;
-    this.line -= 1;
-    this.cursor = Math.min(this.cursor, this.lines[this.line].length);
-    this.cursor = Math.max(0, this.cursor);
-    return true;
-  };
+    if (!this.line) return false
+    this.line -= 1
+    this.cursor = Math.min(this.cursor, this.lines[this.line].length)
+    this.cursor = Math.max(0, this.cursor)
+    return true
+  }
 
   TextArea.prototype.downline = function() {
-    if (this.line >= this.lines.length - 1) return false;
-    this.line += 1;
-    this.cursor = Math.min(this.cursor, this.lines[this.line].length);
-    this.cursor = Math.max(0, this.cursor);
-    return true;
-  };
+    if (this.line >= this.lines.length - 1) return false
+    this.line += 1
+    this.cursor = Math.min(this.cursor, this.lines[this.line].length)
+    this.cursor = Math.max(0, this.cursor)
+    return true
+  }
 
   TextArea.prototype.takeline = function() {
     if (this.lines.length <= 1) {
-      this.lines = [''];
-      return false;
-    };
+      this.lines = ['']
+      return false
+    }
     var before = this.lines.slice(0, this.line),
-        after = this.lines.slice(this.line + 1);
-    this.lines = before.concat(after);
+        after = this.lines.slice(this.line + 1)
+    this.lines = before.concat(after)
     if (after.length < 1) {
-      this.upline();
-      return true;
+      this.upline()
+      return true
     }
-    return false;
-  };
+    return false
+  }
 
   TextArea.prototype.linebefore = function() {
     if (this.maxlines && this.lines.length >= this.maxlines) {
-      //this.end();
-      return false;
+      //this.end()
+      return false
     }
-    this.line -= 1;
+    this.line -= 1
     var before = this.lines.slice(0, this.line),
-        after = this.lines.slice(this.line);
-    this.lines = before.concat('').concat(after);
-    return true;
-  };
+        after = this.lines.slice(this.line)
+    this.lines = before.concat('').concat(after)
+    return true
+  }
 
   TextArea.prototype.lineafter = function() {
     if (this.maxlines &&
         (this.lines.length >= this.maxlines)) {
-      //if (this.line >= this.lines.length - 1) this.end();
-      return false;
+      //if (this.line >= this.lines.length - 1) this.end()
+      return false
     }
-    this.line += 1;
+    this.line += 1
     var before = this.lines.slice(0, this.line),
-        after = this.lines.slice(this.line);
-    this.lines = before.concat('').concat(after);
-    return true;
-  };
+        after = this.lines.slice(this.line)
+    this.lines = before.concat('').concat(after)
+    return true
+  }
 
   var proto = {
     fontfamily: 'monospace',
     fontsize: '14px',
     contentEditable: true
-  };
+  }
 
   proto.onkeydown = function(event) {
-    if (!this.contentEditable) return;
-    var key = event.keyIdentifier;
+    if (!this.contentEditable) return
+    var key = event.keyIdentifier
 
     if (key === 'U+0008') {
-      this.model.backdelete();
+      this.model.backdelete()
     } else if (key === 'U+0009') {
-      this.model.write('  ');
-      event.preventDefault();
+      this.model.write('  ')
+      event.preventDefault()
     } else if (key === 'Enter') {
-      this.model.write('\n');
+      this.model.write('\n')
     } else if (key === 'End') {
-      this.model.end();
+      this.model.end()
     } else if (key === 'Home') {
-      this.model.home();
+      this.model.home()
     } else if (key === 'Left') {
-      this.model.backspace();
+      this.model.backspace()
     } else if (key === 'Up') {
-      this.model.upline();
+      this.model.upline()
     } else if (key === 'Right') {
-      this.model.forwardspace();
+      this.model.forwardspace()
     } else if (key === 'Down') {
-      this.model.downline();
+      this.model.downline()
     } else if (key === 'U+007F') {
-      this.model.forwarddelete();
+      this.model.forwarddelete()
     }
 
-    this.layer.repaint(this);
-    return;
-  };
+    this.layer.repaint(this)
+    return
+  }
 
   proto.ontextinput = function(event) {
-    this.model.write(event.data);
-    this.layer.repaint(this);
-    return true;
-  };
+    this.model.write(event.data)
+    this.layer.repaint(this)
+    return true
+  }
 
-  var keydown;
+  var keydown
 
   proto.onfocus = function() {
-    this.focused = true;
-    document.removeEventListener('keydown', keydown);
-    keydown = proto.onkeydown.bind(this);
-    document.addEventListener('keydown', keydown, false);
-    this.layer.repaint(this);
-  };
+    this.focused = true
+    document.removeEventListener('keydown', keydown)
+    keydown = proto.onkeydown.bind(this)
+    document.addEventListener('keydown', keydown, false)
+    this.layer.repaint(this)
+  }
 
   proto.onblur = function() {
-    this.focused = false;
-    document.removeEventListener('keydown', keydown);
-    this.layer.repaint(this);
-  };
+    this.focused = false
+    document.removeEventListener('keydown', keydown)
+    this.layer.repaint(this)
+  }
 
   proto.ondraw = function(cx, layer) {
     var w = (this.size && this.size[0]) || 400,
         h = (this.size && this.size[1]) || 300,
         cw = cx.measureText(' ').width,
         ch = cw * 2,
-        ctx;
+        ctx
 
     if (!this.size) {
-      w = cw * (this.model.cols + 6);
+      w = cw * (this.model.cols + 6)
     }
 
-    ctx = new meta.Context(w, h);
-    ctx.font = cx.font;
+    ctx = new meta.Context(w, h)
+    ctx.font = cx.font
 
-    ctx.save();
-    ctx.translate(0, 1);
+    ctx.save()
+    ctx.translate(0, 1)
 
     // highlight active line
     if (this.focused && this.highlight) {
-      ctx.fillStyle = meta.hsla(240, 50, 80, 0.2);
-      ctx.fillRect(0, ch + ch * this.model.line - ch, w, ch);
+      ctx.fillStyle = meta.hsla(240, 50, 80, 0.2)
+      ctx.fillRect(0, ch + ch * this.model.line - ch, w, ch)
     }
 
     // show line numbers
     if (this.lines &&
        (this.focused ||
         (this.model.lines.length > 1 || this.model.lines[0].length))) {
-      ctx.fillStyle = '#888';
+      ctx.fillStyle = '#888'
       this.model.lines.forEach(function(line, i) {
-        ctx.fillText(i + 1, cw * 0.5, 0.8 * ch + i * ch);
-      });
+        ctx.fillText(i + 1, cw * 0.5, 0.8 * ch + i * ch)
+      })
 
       // indent
-      ctx.translate(cw * (('' + this.model.lines.length).length + 1), 0);
+      ctx.translate(cw * (('' + this.model.lines.length).length + 1), 0)
     }
 
 
     // write the text & cursor
-    ctx.fillStyle = 'black';
+    ctx.fillStyle = 'black'
     this.model.lines.forEach(function(line, i) {
-      ctx.fillText(line, cw * 0.5, 0.8 * ch + i * ch);
+      ctx.fillText(line, cw * 0.5, 0.8 * ch + i * ch)
 
       if (this.focused &&
         (this.model.line === i)) {
         ctx.fillText('\u258f',
           cw * 0.5 + ctx.measureText(line.slice(0, this.model.cursor)).width,
-          0.8 * ch + i * ch);
+          0.8 * ch + i * ch)
       }
-    }, this);
-    ctx.restore();
+    }, this)
+    ctx.restore()
 
-    ctx.strokeStyle = this.focused ? '#44f' : '#444';
-    ctx.lineWidth = this.focused ? 2 : 1;
-    ctx.strokeRect(0, 0, w, h);
+    ctx.strokeStyle = this.focused ? '#44f' : '#444'
+    ctx.lineWidth = this.focused ? 2 : 1
+    ctx.strokeRect(0, 0, w, h)
 
-    this.draw = layer.makeDrawing(ctx);
+    this.draw = layer.makeDrawing(ctx)
 
-    return this.draw;
-  };
+    return this.draw
+  }
   
   // drag over text to copy
 
   proto.onmask = function() {
-    if (this.draw) return this.mask = meta.mask.bbox(this.draw);
-  };
+    if (this.draw) return this.mask = meta.mask.bbox(this.draw)
+  }
 
-  proto.cursor = 'text';
+  proto.cursor = 'text'
 
-  meta.ui = meta.declareSafely(meta.ui);
+  meta.ui = meta.declareSafely(meta.ui)
 
   meta.ui.proto = meta.declareSafely(meta.ui.proto, {
     text: proto
-  });
+  })
 
   meta.ui = meta.declareSafely(meta.ui, {
     text: function(e) {
-      var t = meta.mixSafely(e, meta.ui.proto.text);
-      t.model = new TextArea();
-      if (meta.def(e.cols)) t.model.cols = e.cols;
-      t.model.write(t.value);
-      return t;
+      var t = meta.mixSafely(e, meta.ui.proto.text)
+      t.model = new TextArea()
+      if (meta.def(e.cols)) t.model.cols = e.cols
+      t.model.write(t.value)
+      return t
     }
-  });
+  })
 
-}).call(this);
+}(this.meta2d);
diff --git a/tests/index.html b/tests/index.html
index 8a86651..9603751 100644
--- a/tests/index.html
+++ b/tests/index.html
@@ -47,7 +47,7 @@
   </noscript>
 
   <!-- Load library and testbed -->
-  <script src="meta2d.js"></script>
+  <script src="../meta2d.js"></script>
   <script src="webtest.js"></script>
 
   <!-- Modules to test -->