diff --git a/Thorfile b/Thorfile
index 6e5f2582..35ed74c6 100644
--- a/Thorfile
+++ b/Thorfile
@@ -4,7 +4,7 @@ class Build < Thor
   # This is the list of files to concatenate. The first file will appear at the top of the final file. All files are relative to the lib directory.
   FILES = [
     "license.js", "src/Global.js", "src/Transition.js", "src/filters/Grayscale.js",
-    "src/util/Type.js", "src/util/Canvas.js", "src/util/Class.js", "src/util/Tween.js", "src/util/Transform.js",
+    "src/util/Type.js", "src/util/Canvas.js", "src/util/Class.js", "src/util/Tween.js", "src/util/Transform.js", "src/util/Geometry.js",
     "src/Animation.js", "src/Node.js", "src/Container.js", "src/Stage.js", "src/Layer.js", "src/Group.js", "src/Shape.js", 
     "src/shapes/Rect.js", "src/shapes/Ellipse.js", "src/shapes/Image.js", "src/shapes/Polygon.js", "src/shapes/Text.js", "src/shapes/Line.js", "src/shapes/Sprite.js"   
   ]
diff --git a/dist/kinetic-core.js b/dist/kinetic-core.js
index d665efe8..e4a3559a 100644
--- a/dist/kinetic-core.js
+++ b/dist/kinetic-core.js
@@ -1083,6 +1083,109 @@ Kinetic.Transform.prototype = {
     }
 };
 
+/*
+ * Utility methods written by jfollas to
+ * handle length and point measurements
+ */
+Kinetic.Geometry = {
+    getLineLength: function(x1, y1, x2, y2) {
+        return Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
+    },
+    getPointOnLine: function(dist, P1x, P1y, P2x, P2y, fromX, fromY) {
+        if(fromX === undefined) {
+            fromX = P1x;
+        }
+        if(fromY === undefined) {
+            fromY = P1y;
+        }
+
+        var m = (P2y - P1y) / ((P2x - P1x) + 0.00000001);
+        var run = Math.sqrt(dist * dist / (1 + m * m));
+        var rise = m * run;
+        var pt;
+
+        if((fromY - P1y) / ((fromX - P1x) + 0.00000001) === m) {
+            pt = {
+                x: fromX + run,
+                y: fromY + rise
+            };
+        }
+        else {
+            var ix, iy;
+
+            var len = this.getLineLength(P1x, P1y, P2x, P2y);
+            if(len < 0.00000001) {
+                return undefined;
+            }
+            var u = (((fromX - P1x) * (P2x - P1x)) + ((fromY - P1y) * (P2y - P1y)));
+            u = u / (len * len);
+            ix = P1x + u * (P2x - P1x);
+            iy = P1y + u * (P2y - P1y);
+
+            var pRise = this.getLineLength(fromX, fromY, ix, iy);
+            var pRun = Math.sqrt(dist * dist - pRise * pRise);
+            run = Math.sqrt(pRun * pRun / (1 + m * m));
+            rise = m * run;
+            pt = {
+                x: ix + run,
+                y: iy + rise
+            };
+        }
+
+        return pt;
+    },
+    getPointOnCubicBezier: function(pct, P1x, P1y, P2x, P2y, P3x, P3y, P4x, P4y) {
+        function CB1(t) {
+            return t * t * t;
+        }
+        function CB2(t) {
+            return 3 * t * t * (1 - t);
+        }
+        function CB3(t) {
+            return 3 * t * (1 - t) * (1 - t);
+        }
+        function CB4(t) {
+            return (1 - t) * (1 - t) * (1 - t);
+        }
+        var x = P4x * CB1(pct) + P3x * CB2(pct) + P2x * CB3(pct) + P1x * CB4(pct);
+        var y = P4y * CB1(pct) + P3y * CB2(pct) + P2y * CB3(pct) + P1y * CB4(pct);
+
+        return {
+            x: x,
+            y: y
+        };
+    },
+    getPointOnQuadraticBezier: function(pct, P1x, P1y, P2x, P2y, P3x, P3y) {
+        function QB1(t) {
+            return t * t;
+        }
+        function QB2(t) {
+            return 2 * t * (1 - t);
+        }
+        function QB3(t) {
+            return (1 - t) * (1 - t);
+        }
+        var x = P3x * QB1(pct) + P2x * QB2(pct) + P1x * QB3(pct);
+        var y = P3y * QB1(pct) + P2y * QB2(pct) + P1y * QB3(pct);
+
+        return {
+            x: x,
+            y: y
+        };
+    },
+    getPointOnEllipticalArc: function(cx, cy, rx, ry, theta, psi) {
+        var cosPsi = Math.cos(psi), sinPsi = Math.sin(psi);
+        var pt = {
+            x: rx * Math.cos(theta),
+            y: ry * Math.sin(theta)
+        };
+        return {
+            x: cx + (pt.x * cosPsi - pt.y * sinPsi),
+            y: cy + (pt.x * sinPsi + pt.y * cosPsi)
+        };
+    }
+};
+
 ///////////////////////////////////////////////////////////////////////
 //  Animation
 ///////////////////////////////////////////////////////////////////////
@@ -4559,9 +4662,7 @@ Kinetic.Ellipse = Kinetic.Shape.extend({
 
         // call super constructor
         this._super(config);
-
         this._convertRadius();
-
         var that = this;
         this.on('radiusChange.kinetic', function() {
             that._convertRadius();
@@ -4891,7 +4992,6 @@ Kinetic.Text = Kinetic.Shape.extend({
             var attr = attrs[n];
             this.on(attr + 'Change.kinetic', that._setTextData);
         }
-
         that._setTextData();
     },
     drawFunc: function(context) {
@@ -5403,7 +5503,6 @@ Kinetic.Sprite = Kinetic.Shape.extend({
         config.drawFunc = this.drawFunc;
         // call super constructor
         this._super(config);
-
         var that = this;
         this.on('animationChange.kinetic', function() {
             // reset index when animation changes
diff --git a/dist/kinetic-core.min.js b/dist/kinetic-core.min.js
index e69de29b..eb35ca54 100644
--- a/dist/kinetic-core.min.js
+++ b/dist/kinetic-core.min.js
@@ -0,0 +1,29 @@
+/**
+ * KineticJS JavaScript Library core
+ * http://www.kineticjs.com/
+ * Copyright 2012, Eric Rowell
+ * Licensed under the MIT or GPL Version 2 licenses.
+ * Date: Jul 28 2012
+ *
+ * Copyright (C) 2011 - 2012 by Eric Rowell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+var Kinetic={};Kinetic.Filters={},Kinetic.Plugins={},Kinetic.Global={BUBBLE_WHITELIST:["mousedown","mousemove","mouseup","mouseover","mouseout","click","dblclick","touchstart","touchmove","touchend","tap","dbltap","dragstart","dragmove","dragend"],stages:[],idCounter:0,tempNodes:[],maxDragTimeInterval:20,drag:{moving:!1,offset:{x:0,y:0},lastDrawTime:0},warn:function(a){console&&console.warn&&console.warn("Kinetic warning: "+a)},_pullNodes:function(a){var b=this.tempNodes;for(var c=0;c<b.length;c++){var d=b[c];d.getStage()!==undefined&&d.getStage()._id===a._id&&(a._addId(d),a._addName(d),this.tempNodes.splice(c,1),c-=1)}}},Kinetic.Transition=function(a,b){function d(a,b,e,f){for(var g in a)g!=="duration"&&g!=="easing"&&g!=="callback"&&(Kinetic.Type._isObject(a[g])?(e[g]={},d(a[g],b[g],e[g],f)):c._add(c._getTween(b,g,a[g],e,f)))}this.node=a,this.config=b,this.tweens=[];var c=this,e={};d(b,a.attrs,e,e);var f=0;for(var g=0;g<this.tweens.length;g++){var h=this.tweens[g];h.onFinished=function(){f++,f>=c.tweens.length&&c.onFinished()}}},Kinetic.Transition.prototype={start:function(){for(var a=0;a<this.tweens.length;a++)this.tweens[a].start()},stop:function(){for(var a=0;a<this.tweens.length;a++)this.tweens[a].stop()},resume:function(){for(var a=0;a<this.tweens.length;a++)this.tweens[a].resume()},_onEnterFrame:function(){for(var a=0;a<this.tweens.length;a++)this.tweens[a].onEnterFrame()},_add:function(a){this.tweens.push(a)},_getTween:function(a,b,c,d,e){var f=this.config,g=this.node,h=f.easing;h===undefined&&(h="linear");var i=new Kinetic.Tween(g,function(a){d[b]=a,g.setAttrs(e)},Kinetic.Tweens[h],a[b],c,f.duration);return i}},Kinetic.Filters.Grayscale=function(){var a=this.imageData.data;for(var b=0;b<a.length;b+=4){var c=.34*a[b]+.5*a[b+1]+.16*a[b+2];a[b]=c,a[b+1]=c,a[b+2]=c}},Kinetic.Type={_isElement:function(a){return!!a&&a.nodeType==1},_isFunction:function(a){return!!(a&&a.constructor&&a.call&&a.apply)},_isObject:function(a){return!!a&&a.constructor==Object},_isArray:function(a){return Object.prototype.toString.call(a)=="[object Array]"},_isNumber:function(a){return Object.prototype.toString.call(a)=="[object Number]"},_isString:function(a){return Object.prototype.toString.call(a)=="[object String]"},_hasMethods:function(a){var b=[];for(var c in a)this._isFunction(a[c])&&b.push(c);return b.length>0},_getXY:function(a){if(this._isNumber(a))return{x:a,y:a};if(this._isArray(a)){if(a.length===1){var b=a[0];if(this._isNumber(b))return{x:b,y:b};if(this._isArray(b))return{x:b[0],y:b[1]};if(this._isObject(b))return b}else if(a.length>=2)return{x:a[0],y:a[1]}}else if(this._isObject(a))return a;return{x:0,y:0}},_getSize:function(a){if(this._isNumber(a))return{width:a,height:a};if(this._isArray(a))if(a.length===1){var b=a[0];if(this._isNumber(b))return{width:b,height:b};if(this._isArray(b)){if(b.length>=4)return{width:b[2],height:b[3]};if(b.length>=2)return{width:b[0],height:b[1]}}else if(this._isObject(b))return b}else{if(a.length>=4)return{width:a[2],height:a[3]};if(a.length>=2)return{width:a[0],height:a[1]}}else if(this._isObject(a))return a;return{width:0,height:0}},_getPoints:function(a){if(a===undefined)return[];if(this._isObject(a[0]))return a;var b=[];for(var c=0;c<a.length;c+=2)b.push({x:a[c],y:a[c+1]});return b},_getImage:function(a,b){if(!a)b(null);else if(this._isElement(a))b(a);else if(this._isString(a)){var c=new Image;c.onload=function(){b(c)},c.src=a}else if(a.data){var d=document.createElement("canvas");d.width=a.width,d.height=a.height;var e=d.getContext("2d");e.putImageData(a,0,0);var f=d.toDataURL(),c=new Image;c.onload=function(){b(c)},c.src=f}else b(null)}},Kinetic.Canvas=function(a,b){this.element=document.createElement("canvas"),this.context=this.element.getContext("2d"),this.element.width=a,this.element.height=b},Kinetic.Canvas.prototype={clear:function(){var a=this.getContext(),b=this.getElement();a.clearRect(0,0,b.width,b.height)},getElement:function(){return this.element},getContext:function(){return this.context},setWidth:function(a){this.element.width=a},setHeight:function(a){this.element.height=a},getWidth:function(){return this.element.width},getHeight:function(){return this.element.height},setSize:function(a,b){this.setWidth(a),this.setHeight(b)},strip:function(){var a=this.context;a.stroke=function(){},a.fill=function(){},a.fillRect=function(b,c,d,e){a.rect(b,c,d,e)},a.strokeRect=function(b,c,d,e){a.rect(b,c,d,e)},a.drawImage=function(){},a.fillText=function(){},a.strokeText=function(){}},toDataURL:function(a,b){try{return this.element.toDataURL(a,b)}catch(c){return this.element.toDataURL()}}},function(){var a=!1;Kinetic.Class=function(){},Kinetic.Class.extend=function(b){function f(){!a&&this.init&&this.init.apply(this,arguments)}var c=this.prototype;a=!0;var d=new this;a=!1;for(var e in b)d[e]=typeof b[e]=="function"&&typeof c[e]=="function"?function(a,b){return function(){var d=this._super;this._super=c[a];var e=b.apply(this,arguments);return this._super=d,e}}(e,b[e]):b[e];return f.prototype=d,f.prototype.constructor=f,f.extend=arguments.callee,f}}(),Kinetic.Tween=function(a,b,c,d,e,f){this._listeners=[],this.addListener(this),this.obj=a,this.propFunc=b,this.begin=d,this._pos=d,this.setDuration(f),this.isPlaying=!1,this._change=0,this.prevTime=0,this.prevPos=0,this.looping=!1,this._time=0,this._position=0,this._startTime=0,this._finish=0,this.name="",this.func=c,this.setFinish(e)},Kinetic.Tween.prototype={setTime:function(a){this.prevTime=this._time,a>this.getDuration()?this.looping?(this.rewind(a-this._duration),this.update(),this.broadcastMessage("onLooped",{target:this,type:"onLooped"})):(this._time=this._duration,this.update(),this.stop(),this.broadcastMessage("onFinished",{target:this,type:"onFinished"})):a<0?(this.rewind(),this.update()):(this._time=a,this.update())},getTime:function(){return this._time},setDuration:function(a){this._duration=a===null||a<=0?1e5:a},getDuration:function(){return this._duration},setPosition:function(a){this.prevPos=this._pos,this.propFunc(a),this._pos=a,this.broadcastMessage("onChanged",{target:this,type:"onChanged"})},getPosition:function(a){return a===undefined&&(a=this._time),this.func(a,this.begin,this._change,this._duration)},setFinish:function(a){this._change=a-this.begin},getFinish:function(){return this.begin+this._change},start:function(){this.rewind(),this.startEnterFrame(),this.broadcastMessage("onStarted",{target:this,type:"onStarted"})},rewind:function(a){this.stop(),this._time=a===undefined?0:a,this.fixTime(),this.update()},fforward:function(){this._time=this._duration,this.fixTime(),this.update()},update:function(){this.setPosition(this.getPosition(this._time))},startEnterFrame:function(){this.stopEnterFrame(),this.isPlaying=!0,this.onEnterFrame()},onEnterFrame:function(){this.isPlaying&&this.nextFrame()},nextFrame:function(){this.setTime((this.getTimer()-this._startTime)/1e3)},stop:function(){this.stopEnterFrame(),this.broadcastMessage("onStopped",{target:this,type:"onStopped"})},stopEnterFrame:function(){this.isPlaying=!1},continueTo:function(a,b){this.begin=this._pos,this.setFinish(a),this._duration!==undefined&&this.setDuration(b),this.start()},resume:function(){this.fixTime(),this.startEnterFrame(),this.broadcastMessage("onResumed",{target:this,type:"onResumed"})},yoyo:function(){this.continueTo(this.begin,this._time)},addListener:function(a){return this.removeListener(a),this._listeners.push(a)},removeListener:function(a){var b=this._listeners,c=b.length;while(c--)if(b[c]==a)return b.splice(c,1),!0;return!1},broadcastMessage:function(){var a=[];for(var b=0;b<arguments.length;b++)a.push(arguments[b]);var c=a.shift(),d=this._listeners,e=d.length;for(var b=0;b<e;b++)d[b][c]&&d[b][c].apply(d[b],a)},fixTime:function(){this._startTime=this.getTimer()-this._time*1e3},getTimer:function(){return(new Date).getTime()-this._time}},Kinetic.Tweens={"back-ease-in":function(a,b,c,d,e,f){var g=1.70158;return c*(a/=d)*a*((g+1)*a-g)+b},"back-ease-out":function(a,b,c,d,e,f){var g=1.70158;return c*((a=a/d-1)*a*((g+1)*a+g)+1)+b},"back-ease-in-out":function(a,b,c,d,e,f){var g=1.70158;return(a/=d/2)<1?c/2*a*a*(((g*=1.525)+1)*a-g)+b:c/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},"elastic-ease-in":function(a,b,c,d,e,f){var g=0;return a===0?b:(a/=d)==1?b+c:(f||(f=d*.3),!e||e<Math.abs(c)?(e=c,g=f/4):g=f/(2*Math.PI)*Math.asin(c/e),-(e*Math.pow(2,10*(a-=1))*Math.sin((a*d-g)*2*Math.PI/f))+b)},"elastic-ease-out":function(a,b,c,d,e,f){var g=0;return a===0?b:(a/=d)==1?b+c:(f||(f=d*.3),!e||e<Math.abs(c)?(e=c,g=f/4):g=f/(2*Math.PI)*Math.asin(c/e),e*Math.pow(2,-10*a)*Math.sin((a*d-g)*2*Math.PI/f)+c+b)},"elastic-ease-in-out":function(a,b,c,d,e,f){var g=0;return a===0?b:(a/=d/2)==2?b+c:(f||(f=d*.3*1.5),!e||e<Math.abs(c)?(e=c,g=f/4):g=f/(2*Math.PI)*Math.asin(c/e),a<1?-0.5*e*Math.pow(2,10*(a-=1))*Math.sin((a*d-g)*2*Math.PI/f)+b:e*Math.pow(2,-10*(a-=1))*Math.sin((a*d-g)*2*Math.PI/f)*.5+c+b)},"bounce-ease-out":function(a,b,c,d){return(a/=d)<1/2.75?c*7.5625*a*a+b:a<2/2.75?c*(7.5625*(a-=1.5/2.75)*a+.75)+b:a<2.5/2.75?c*(7.5625*(a-=2.25/2.75)*a+.9375)+b:c*(7.5625*(a-=2.625/2.75)*a+.984375)+b},"bounce-ease-in":function(a,b,c,d){return c-Kinetic.Tweens["bounce-ease-out"](d-a,0,c,d)+b},"bounce-ease-in-out":function(a,b,c,d){return a<d/2?Kinetic.Tweens["bounce-ease-in"](a*2,0,c,d)*.5+b:Kinetic.Tweens["bounce-ease-out"](a*2-d,0,c,d)*.5+c*.5+b},"ease-in":function(a,b,c,d){return c*(a/=d)*a+b},"ease-out":function(a,b,c,d){return-c*(a/=d)*(a-2)+b},"ease-in-out":function(a,b,c,d){return(a/=d/2)<1?c/2*a*a+b:-c/2*(--a*(a-2)-1)+b},"strong-ease-in":function(a,b,c,d){return c*(a/=d)*a*a*a*a+b},"strong-ease-out":function(a,b,c,d){return c*((a=a/d-1)*a*a*a*a+1)+b},"strong-ease-in-out":function(a,b,c,d){return(a/=d/2)<1?c/2*a*a*a*a*a+b:c/2*((a-=2)*a*a*a*a+2)+b},linear:function(a,b,c,d){return c*a/d+b}},Kinetic.Transform=function(){this.m=[1,0,0,1,0,0]},Kinetic.Transform.prototype={translate:function(a,b){this.m[4]+=this.m[0]*a+this.m[2]*b,this.m[5]+=this.m[1]*a+this.m[3]*b},scale:function(a,b){this.m[0]*=a,this.m[1]*=a,this.m[2]*=b,this.m[3]*=b},rotate:function(a){var b=Math.cos(a),c=Math.sin(a),d=this.m[0]*b+this.m[2]*c,e=this.m[1]*b+this.m[3]*c,f=this.m[0]*-c+this.m[2]*b,g=this.m[1]*-c+this.m[3]*b;this.m[0]=d,this.m[1]=e,this.m[2]=f,this.m[3]=g},getTranslation:function(){return{x:this.m[4],y:this.m[5]}},multiply:function(a){var b=this.m[0]*a.m[0]+this.m[2]*a.m[1],c=this.m[1]*a.m[0]+this.m[3]*a.m[1],d=this.m[0]*a.m[2]+this.m[2]*a.m[3],e=this.m[1]*a.m[2]+this.m[3]*a.m[3],f=this.m[0]*a.m[4]+this.m[2]*a.m[5]+this.m[4],g=this.m[1]*a.m[4]+this.m[3]*a.m[5]+this.m[5];this.m[0]=b,this.m[1]=c,this.m[2]=d,this.m[3]=e,this.m[4]=f,this.m[5]=g},invert:function(){var a=1/(this.m[0]*this.m[3]-this.m[1]*this.m[2]),b=this.m[3]*a,c=-this.m[1]*a,d=-this.m[2]*a,e=this.m[0]*a,f=a*(this.m[2]*this.m[5]-this.m[3]*this.m[4]),g=a*(this.m[1]*this.m[4]-this.m[0]*this.m[5]);this.m[0]=b,this.m[1]=c,this.m[2]=d,this.m[3]=e,this.m[4]=f,this.m[5]=g},getMatrix:function(){return this.m}},Kinetic.Geometry={getLineLength:function(a,b,c,d){return Math.sqrt((c-a)*(c-a)+(d-b)*(d-b))},getPointOnLine:function(a,b,c,d,e,f,g){f===undefined&&(f=b),g===undefined&&(g=c);var h=(e-c)/(d-b+1e-8),i=Math.sqrt(a*a/(1+h*h)),j=h*i,k;if((g-c)/(f-b+1e-8)===h)k={x:f+i,y:g+j};else{var l,m,n=this.getLineLength(b,c,d,e);if(n<1e-8)return undefined;var o=(f-b)*(d-b)+(g-c)*(e-c);o/=n*n,l=b+o*(d-b),m=c+o*(e-c);var p=this.getLineLength(f,g,l,m),q=Math.sqrt(a*a-p*p);i=Math.sqrt(q*q/(1+h*h)),j=h*i,k={x:l+i,y:m+j}}return k},getPointOnCubicBezier:function(a,b,c,d,e,f,g,h,i){function j(a){return a*a*a}function k(a){return 3*a*a*(1-a)}function l(a){return 3*a*(1-a)*(1-a)}function m(a){return(1-a)*(1-a)*(1-a)}var n=h*j(a)+f*k(a)+d*l(a)+b*m(a),o=i*j(a)+g*k(a)+e*l(a)+c*m(a);return{x:n,y:o}},getPointOnQuadraticBezier:function(a,b,c,d,e,f,g){function h(a){return a*a}function i(a){return 2*a*(1-a)}function j(a){return(1-a)*(1-a)}var k=f*h(a)+d*i(a)+b*j(a),l=g*h(a)+e*i(a)+c*j(a);return{x:k,y:l}},getPointOnEllipticalArc:function(a,b,c,d,e,f){var g=Math.cos(f),h=Math.sin(f),i={x:c*Math.cos(e),y:d*Math.sin(e)};return{x:a+(i.x*g-i.y*h),y:b+(i.x*h+i.y*g)}}},Kinetic.Animation={animations:[],animIdCounter:0,animRunning:!1,frame:{time:0,timeDiff:0,lastTime:(new Date).getTime()},_addAnimation:function(a){a.id=this.animIdCounter++,this.animations.push(a)},_removeAnimation:function(a){var b=a.id,c=this.animations;for(var d=0;d<c.length;d++)if(c[d].id===b)return this.animations.splice(d,1),!1},_runFrames:function(){var a={};for(var b=0;b<this.animations.length;b++){var c=this.animations[b];c.node&&c.node._id!==undefined&&(a[c.node._id]=c.node),c.func&&c.func(this.frame)}for(var d in a)a[d].draw()},_updateFrameObject:function(){var a=(new Date).getTime();this.frame.timeDiff=a-this.frame.lastTime,this.frame.lastTime=a,this.frame.time+=this.frame.timeDiff},_animationLoop:function(){if(this.animations.length>0){this._updateFrameObject(),this._runFrames();var a=this;requestAnimFrame(function(){a._animationLoop()})}else this.animRunning=!1,this.frame.lastTime=0},_handleAnimation:function(){var a=this;this.animRunning?this.frame.lastTime=0:(this.animRunning=!0,a._animationLoop())}},requestAnimFrame=function(a){return window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(a){window.setTimeout(a,1e3/60)}}(),Kinetic.Node=Kinetic.Class.extend({init:function(a){this.defaultNodeAttrs={visible:!0,listening:!0,name:undefined,alpha:1,x:0,y:0,scale:{x:1,y:1},rotation:0,offset:{x:0,y:0},dragConstraint:"none",dragBounds:{},draggable:!1,dragThrottle:80},this.setDefaultAttrs(this.defaultNodeAttrs),this.eventListeners={},this.lastDragTime=0,this.setAttrs(a),this.on("draggableChange.kinetic",function(){this._onDraggableChange()});var b=this;this.on("idChange.kinetic",function(a){var c=b.getStage();c&&(c._removeId(a.oldVal),c._addId(b))}),this.on("nameChange.kinetic",function(a){var c=b.getStage();c&&(c._removeName(a.oldVal,b._id),c._addName(b))}),this._onDraggableChange()},on:function(a,b){var c=a.split(" ");for(var d=0;d<c.length;d++){var e=c[d],f=e,g=f.split("."),h=g[0],i=g.length>1?g[1]:"";this.eventListeners[h]||(this.eventListeners[h]=[]),this.eventListeners[h].push({name:i,handler:b})}},off:function(a){var b=a.split(" ");for(var c=0;c<b.length;c++){var d=b[c],e=d,f=e.split("."),g=f[0];if(this.eventListeners[g]&&f.length>1){var h=f[1];for(var i=0;i<this.eventListeners[g].length;i++)if(this.eventListeners[g][i].name===h){this.eventListeners[g].splice(i,1);if(this.eventListeners[g].length===0){delete this.eventListeners[g];break}i--}}else delete this.eventListeners[g]}},getAttrs:function(){return this.attrs},setDefaultAttrs:function(a){this.attrs===undefined&&(this.attrs={});if(a)for(var b in a)this.attrs[b]===undefined&&(this.attrs[b]=a[b])},setAttrs:function(a){var b=Kinetic.Type,c=this;if(a!==undefined){function d(a,e,f){for(var g in e){var h=e[g],i=a[g];f===0&&c._fireBeforeChangeEvent(g,i,h),a[g]===undefined&&h!==undefined&&(a[g]={});if(b._isObject(h)&&!b._isArray(h)&&!b._isElement(h)&&!b._hasMethods(h))Kinetic.Type._isObject(a[g])||(a[g]={}),d(a[g],h,f+1);else switch(g){case"rotationDeg":c._setAttr(a,"rotation",e[g]*Math.PI/180),g="rotation";break;case"offset":var j=b._getXY(h);c._setAttr(a[g],"x",j.x),c._setAttr(a[g],"y",j.y);break;case"scale":var j=b._getXY(h);c._setAttr(a[g],"x",j.x),c._setAttr(a[g],"y",j.y);break;case"points":c._setAttr(a,g,b._getPoints(h));break;case"crop":var j=b._getXY(h),k=b._getSize(h);c._setAttr(a[g],"x",j.x),c._setAttr(a[g],"y",j.y),c._setAttr(a[g],"width",k.width),c._setAttr(a[g],"height",k.height);break;default:c._setAttr(a,g,h)}f===0&&c._fireChangeEvent(g,i,h)}}d(this.attrs,a,0)}},isVisible:function(){return this.attrs.visible&&this.getParent()&&!this.getParent().isVisible()?!1:this.attrs.visible},show:function(){this.setAttrs({visible:!0})},hide:function(){this.setAttrs({visible:!1})},getZIndex:function(){return this.index},getAbsoluteZIndex:function(){function e(b){var f=[];for(var g=0;g<b.length;g++){var h=b[g];d++,h.nodeType!=="Shape"&&(f=f.concat(h.getChildren())),h._id===c._id&&(g=b.length)}f.length>0&&f[0].getLevel()<=a&&e(f)}var a=this.getLevel(),b=this.getStage(),c=this,d=0;return c.nodeType!=="Stage"&&e(c.getStage().getChildren()),d},getLevel:function(){var a=0,b=this.parent;while(b)a++,b=b.parent;return a},setPosition:function(){var a=Kinetic.Type._getXY(Array.prototype.slice.call(arguments));this.setAttrs(a)},getPosition:function(){return{x:this.attrs.x,y:this.attrs.y}},getAbsolutePosition:function(){var a=this.getAbsoluteTransform(),b=this.getOffset();return a.translate(b.x,b.y),a.getTranslation()},setAbsolutePosition:function(){var a=Kinetic.Type._getXY(Array.prototype.slice.call(arguments)),b=this._clearTransform();this.attrs.x=b.x,this.attrs.y=b.y,delete b.x,delete b.y;var c=this.getAbsoluteTransform();c.invert(),c.translate(a.x,a.y),a={x:this.attrs.x+c.getTranslation().x,y:this.attrs.y+c.getTranslation().y},this.setPosition(a.x,a.y),this._setTransform(b)},move:function(){var a=Kinetic.Type._getXY(Array.prototype.slice.call(arguments)),b=this.getX(),c=this.getY();a.x!==undefined&&(b+=a.x),a.y!==undefined&&(c+=a.y),this.setAttrs({x:b,y:c})},getRotationDeg:function(){return this.attrs.rotation*180/Math.PI},rotate:function(a){this.setAttrs({rotation:this.getRotation()+a})},rotateDeg:function(a){this.setAttrs({rotation:this.getRotation()+a*Math.PI/180})},moveToTop:function(){var a=this.index;this.parent.children.splice(a,1),this.parent.children.push(this),this.parent._setChildrenIndices()},moveUp:function(){var a=this.index;this.parent.children.splice(a,1),this.parent.children.splice(a+1,0,this),this.parent._setChildrenIndices()},moveDown:function(){var a=this.index;a>0&&(this.parent.children.splice(a,1),this.parent.children.splice(a-1,0,this),this.parent._setChildrenIndices())},moveToBottom:function(){var a=this.index;this.parent.children.splice(a,1),this.parent.children.unshift(this),this.parent._setChildrenIndices()},setZIndex:function(a){var b=this.index;this.parent.children.splice(b,1),this.parent.children.splice(a,0,this),this.parent._setChildrenIndices()},getAbsoluteAlpha:function(){var a=1,b=this;while(b.nodeType!=="Stage")a*=b.attrs.alpha,b=b.parent;return a},isDragging:function(){var a=Kinetic.Global;return a.drag.node!==undefined&&a.drag.node._id===this._id&&a.drag.moving},moveTo:function(a){var b=this.parent;b.children.splice(this.index,1),b._setChildrenIndices(),a.children.push(this),this.index=a.children.length-1,this.parent=a,a._setChildrenIndices()},getParent:function(){return this.parent},getLayer:function(){return this.nodeType==="Layer"?this:this.getParent().getLayer()},getStage:function(){return this.nodeType!=="Stage"&&this.getParent()?this.getParent().getStage():this.nodeType==="Stage"?this:undefined},simulate:function(a){this._handleEvent(a,{})},transitionTo:function(a){var b=Kinetic.Animation;this.transAnim&&(b._removeAnimation(this.transAnim),this.transAnim=null);var c=this.nodeType==="Stage"?this:this.getLayer(),d=this,e=new Kinetic.Transition(this,a),f={func:function(){e._onEnterFrame()},node:c};return this.transAnim=f,b._addAnimation(f),e.onFinished=function(){b._removeAnimation(f),d.transAnim=null,a.callback!==undefined&&a.callback(),f.node.draw()},e.start(),b._handleAnimation(),e},getAbsoluteTransform:function(){var a=new Kinetic.Transform,b=[],c=this.parent;b.unshift(this);while(c)b.unshift(c),c=c.parent;for(var d=0;d<b.length;d++){var e=b[d],f=e.getTransform();a.multiply(f)}return a},getTransform:function(){var a=new Kinetic.Transform;return(this.attrs.x!==0||this.attrs.y!==0)&&a.translate(this.attrs.x,this.attrs.y),this.attrs.rotation!==0&&a.rotate(this.attrs.rotation),(this.attrs.scale.x!==1||this.attrs.scale.y!==1)&&a.scale(this.attrs.scale.x,this.attrs.scale.y),this.attrs.offset&&(this.attrs.offset.x!==0||this.attrs.offset.y!==0)&&a.translate(-1*this.attrs.offset.x,-1*this.attrs.offset.y),a},clone:function(a){var b=this.shapeType||this.nodeType,c=new Kinetic[b](this.attrs);for(var d in this.eventListeners){var e=this.eventListeners[d];for(var f=0;f<e.length;f++){var g=e[f];g.name.indexOf("kinetic")<0&&(c.eventListeners[d]||(c.eventListeners[d]=[]),c.eventListeners[d].push(g))}}return c.setAttrs(a),c},saveImageData:function(a,b){try{var c;if(a&&b)c=new Kinetic.Canvas(a,b);else{var d=this.getStage();c=d.bufferCanvas}var e=c.getContext();c.clear(),this._draw(c);var f=e.getImageData(0,0,c.getWidth(),c.getHeight());this.imageData=f}catch(g){Kinetic.Global.warn("Image data could not saved because canvas is dirty.")}},clearImageData:function(){delete this.imageData},getImageData:function(){return this.imageData},toDataURL:function(a){var b=a&&a.mimeType?a.mimeType:null,c=a&&a.quality?a.quality:null,d;a&&a.width&&a.height?d=new Kinetic.Canvas(a.width,a.height):d=this.getStage().bufferCanvas;var e=d.getContext();return d.clear(),this._draw(d),d.toDataURL(b,c)},toImage:function(a){Kinetic.Type._getImage(this.toDataURL(a),function(b){a.callback(b)})},_clearTransform:function(){var a={x:this.attrs.x,y:this.attrs.y,rotation:this.attrs.rotation,scale:{x:this.attrs.scale.x,y:this.attrs.scale.y},offset:{x:this.attrs.offset.x,y:this.attrs.offset.y}};return this.attrs.x=0,this.attrs.y=0,this.attrs.rotation=0,this.attrs.scale={x:1,y:1},this.attrs.offset={x:0,y:0},a},_setTransform:function(a){for(var b in a)this.attrs[b]=a[b]},_setImageData:function(a){a&&a.data&&(this.imageData=a)},_fireBeforeChangeEvent:function(a,b,c){this._handleEvent("before"+a.toUpperCase()+"Change",{oldVal:b,newVal:c})},_fireChangeEvent:function(a,b,c){this._handleEvent(a+"Change",{oldVal:b,newVal:c})},_setAttr:function(a,b,c){c!==undefined&&(a===undefined&&(a={}),a[b]=c)},_listenDrag:function(){this._dragCleanup();var a=Kinetic.Global,b=this;this.on("mousedown.kinetic touchstart.kinetic",function(a){b._initDrag()})},_initDrag:function(){var a=Kinetic.Global,b=this.getStage(),c=b.getUserPosition();if(c){var d=this.getTransform().getTranslation(),e=this.getAbsoluteTransform().getTranslation(),f=this.getAbsolutePosition();a.drag.node=this,a.drag.offset.x=c.x-f.x,a.drag.offset.y=c.y-f.y}},_onDraggableChange:function(){if(this.attrs.draggable)this._listenDrag();else{this._dragCleanup();var a=this.getStage(),b=Kinetic.Global;a&&b.drag.node&&b.drag.node._id===this._id&&a._endDrag()}},_dragCleanup:function(){this.off("mousedown.kinetic"),this.off("touchstart.kinetic")},_handleEvent:function(a,b){this.nodeType==="Shape"&&(b.shape=this);var c=this.getStage(),d=c?c.mouseoverShape:null,e=c?c.mouseoutShape:null,f=this.eventListeners,g=!0;a==="mouseover"&&e&&e._id===this._id?g=!1:a==="mouseout"&&d&&d._id===this._id&&(g=!1);if(g){if(f[a]){var h=f[a];for(var i=0;i<h.length;i++)h[i].handler.apply(this,[b])}c&&d&&e&&(c.mouseoverShape=d.parent,c.mouseoutShape=e.parent),Kinetic.Global.BUBBLE_WHITELIST.indexOf(a)>=0&&!b.cancelBubble&&this.parent&&this._handleEvent.call(this.parent,a,b)}}}),Kinetic.Node.addSetters=function(constructor,a){for(var b=0;b<a.length;b++){var c=a[b];this._addSetter(constructor,c)}},Kinetic.Node.addGetters=function(constructor,a){for(var b=0;b<a.length;b++){var c=a[b];this._addGetter(constructor,c)}},Kinetic.Node.addGettersSetters=function(constructor,a){this.addSetters(constructor,a),this.addGetters(constructor,a)},Kinetic.Node._addSetter=function(constructor,a){var b=this,c="set"+a.charAt(0).toUpperCase()+a.slice(1);constructor.prototype[c]=function(){arguments.length==1?arg=arguments[0]:arg=Array.prototype.slice.call(arguments);var b={};b[a]=arg,this.setAttrs(b)}},Kinetic.Node._addGetter=function(constructor,a){var b=this,c="get"+a.charAt(0).toUpperCase()+a.slice(1);constructor.prototype[c]=function(b){return this.attrs[a]}},Kinetic.Node.addGettersSetters(Kinetic.Node,["x","y","scale","detectionType","rotation","alpha","name","id","offset","draggable","dragConstraint","dragBounds","listening","dragThrottle"]),Kinetic.Node.addSetters(Kinetic.Node,["rotationDeg"]),Kinetic.Container=Kinetic.Node.extend({init:function(a){this.children=[],this._super(a)},getChildren:function(){return this.children},removeChildren:function(){while(this.children.length>0)this.remove(this.children[0])},add:function(a){a._id=Kinetic.Global.idCounter++,a.index=this.children.length,a.parent=this,this.children.push(a);var b=a.getStage();if(!b){var c=Kinetic.Global;c.tempNodes.push(a)}else{b._addId(a),b._addName(a);var c=Kinetic.Global;c._pullNodes(b)}return this._add!==undefined&&this._add(a),this},remove:function(a){if(a&&a.index!==undefined&&this.children[a.index]._id==a._id){var b=this.getStage();b!==undefined&&(b._removeId(a.getId()),b._removeName(a.getName(),a._id));var c=Kinetic.Global;for(var d=0;d<c.tempNodes.length;d++){var e=c.tempNodes[d];if(e._id===a._id){c.tempNodes.splice(d,1);break}}this.children.splice(a.index,1),this._setChildrenIndices();while(a.children&&a.children.length>0)a.remove(a.children[0]);this._remove!==undefined&&this._remove(a)}return this},get:function(a){var b=this.getStage(),c,d=a.slice(1);if(a.charAt(0)==="#")c=b.ids[d]!==undefined?[b.ids[d]]:[];else{if(a.charAt(0)!==".")return a==="Shape"||a==="Group"||a==="Layer"?this._getNodes(a):!1;c=b.names[d]!==undefined?b.names[d]:[]}var e=[];for(var f=0;f<c.length;f++){var g=c[f];this.isAncestorOf(g)&&e.push(g)}return e},isAncestorOf:function(a){if(this.nodeType==="Stage")return!0;var b=a.getParent();while(b){if(b._id===this._id)return!0;b=b.getParent()}return!1},getIntersections:function(){var a=Kinetic.Type._getXY(Array.prototype.slice.call(arguments)),b=[],c=this.get("Shape");for(var d=0;d<c.length;d++){var e=c[d];e.isVisible()&&e.intersects(a)&&b.push(e)}return b},_getNodes:function(a){function c(d){var e=d.getChildren();for(var f=0;f<e.length;f++){var g=e[f];g.nodeType===a?b.push(g):g.nodeType!=="Shape"&&c(g)}}var b=[];return c(this),b},_drawChildren:function(a){var b=this.getStage(),c=this.children;for(var d=0;d<c.length;d++){var e=c[d];e.nodeType==="Shape"?e.isVisible()&&b.isVisible()&&e._draw(a):e.draw(a)}},_setChildrenIndices:function(){for(var a=0;a<this.children.length;a++)this.children[a].index=a}}),Kinetic.Stage=Kinetic.Container.extend({init:function(a){this.setDefaultAttrs({width:400,height:200}),typeof a.container=="string"&&(a.container=document.getElementById(a.container)),this._super(a),this._setStageDefaultProperties(),this._id=Kinetic.Global.idCounter++,this._buildDOM(),this._bindContentEvents(),this.on("widthChange.kinetic",function(){this._resizeDOM()}),this.on("heightChange.kinetic",function(){this._resizeDOM()});var b=Kinetic.Global;b.stages.push(this),this._addId(this),this._addName(this)},onFrame:function(a){this.anim={func:a}},start:function(){if(!this.animRunning){var a=Kinetic.Animation;a._addAnimation(this.anim),a._handleAnimation(),this.animRunning=!0}},stop:function(){Kinetic.Animation._removeAnimation(this.anim),this.animRunning=!1},draw:function(a){this._draw(a)},setSize:function(){var a=Kinetic.Type._getSize(Array.prototype.slice.call(arguments));this.setAttrs(a)},getSize:function(){return{width:this.attrs.width,height:this.attrs.height}},clear:function(){var a=this.children;for(var b=0;b<a.length;b++)a[b].clear()},toJSON:function(){function b(c){var d={};d.attrs={};for(var e in c.attrs){var f=c.attrs[e];!a._isFunction(f)&&!a._isElement(f)&&!a._hasMethods(f)&&(d.attrs[e]=f)}d.nodeType=c.nodeType,d.shapeType=c.shapeType;if(c.nodeType!=="Shape"){d.children=[];var g=c.getChildren();for(var h=0;h<g.length;h++){var i=g[h];d.children.push(b(i))}}return d}var a=Kinetic.Type;return JSON.stringify(b(this))},reset:function(){this.removeChildren(),this._setStageDefaultProperties(),this.setAttrs(this.defaultNodeAttrs)},load:function(a){function b(a,c){var d=c.children;if(d!==undefined)for(var e=0;e<d.length;e++){var f=d[e],g;f.nodeType==="Shape"?f.shapeType===undefined?g="Shape":g=f.shapeType:g=f.nodeType;var h=new Kinetic[g](f.attrs);a.add(h),b(h,f)}}this.reset();var c=JSON.parse(a);this.attrs=c.attrs,b(this,c),this.draw()},getMousePosition:function(a){return this.mousePos},getTouchPosition:function(a){return this.touchPos},getUserPosition:function(a){return this.getTouchPosition()||this.getMousePosition()},getContainer:function(){return this.attrs.container},getStage:function(){return this},getDOM:function(){return this.content},toDataURL:function(a){function i(d){var e=h[d],j=e.getCanvas().toDataURL(b,c),k=new Image;k.onload=function(){g.drawImage(k,0,0),d<h.length-1?i(d+1):a.callback(f.toDataURL(b,c))},k.src=j}var b=a&&a.mimeType?a.mimeType:null,c=a&&a.quality?a.quality:null,d=a&&a.width?a.width:this.attrs.width,e=a&&a.height?a.height:this.attrs.height,f=new Kinetic.Canvas(d,e),g=f.getContext(),h=this.children;i(0)},toImage:function(a){this.toDataURL({callback:function(b){Kinetic.Type._getImage(b,function(b){a.callback(b)})}})},_resizeDOM:function(){var a=this.attrs.width,b=this.attrs.height;this.content.style.width=a+"px",this.content.style.height=b+"px",this.bufferCanvas.setSize(a,b),this.pathCanvas.setSize(a,b);var c=this.children;for(var d=0;d<c.length;d++){var e=c[d];e.getCanvas().setSize(a,b),e.draw()}},_remove:function(a){try{this.content.removeChild(a.canvas)}catch(b){}},_add:function(a){a.canvas.setSize(this.attrs.width,this.attrs.height),a.draw(),this.content.appendChild(a.canvas.element),a.lastDrawTime=0},_detectEvent:function(a,b){var c=Kinetic.Global.drag.moving,d=Kinetic.Global,e=this.getUserPosition(),f=a.eventListeners,g=this;this.targetShape&&a._id===this.targetShape._id&&(this.targetFound=!0);if(a.isVisible()&&e!==undefined&&a.intersects(e)){if(!c&&this.mouseDown)return this.mouseDown=!1,this.clickStart=!0,a._handleEvent("mousedown",b),!0;if(this.mouseUp)return this.mouseUp=!1,a._handleEvent("mouseup",b),this.clickStart&&(!d.drag.moving||!d.drag.node)&&(a._handleEvent("click",b),this.inDoubleClickWindow&&a._handleEvent("dblclick",b),this.inDoubleClickWindow=!0,setTimeout(function(){g.inDoubleClickWindow=!1},this.dblClickWindow)),!0;if(!c&&this.touchStart&&!this.touchMove)return this.touchStart=!1,this.tapStart=!0,a._handleEvent("touchstart",b),!0;if(this.touchEnd)return this.touchEnd=!1,a._handleEvent("touchend",b),this.tapStart&&(!d.drag.moving||!d.drag.node)&&(a._handleEvent("tap",b),this.inDoubleClickWindow&&a._handleEvent("dbltap",b),this.inDoubleClickWindow=!0,setTimeout(function(){g.inDoubleClickWindow=!1},this.dblClickWindow)),!0;if(!c&&this.touchMove)return a._handleEvent("touchmove",b),!0;if(!c&&this._isNewTarget(a,b))return this.mouseoutShape&&(this.mouseoverShape=a,this.mouseoutShape._handleEvent("mouseout",b),this.mouseoverShape=undefined),a._handleEvent("mouseover",b),this._setTarget(a),!0;if(!c&&this.mouseMove)return a._handleEvent("mousemove",b),!0}else if(!c&&this.targetShape&&this.targetShape._id===a._id)return this._setTarget(undefined),this.mouseoutShape=a,!0;return!1},_setTarget:function(a){this.targetShape=a,this.targetFound=!0},_isNewTarget:function(a,b){if(!this.targetShape||!this.targetFound&&a._id!==this.targetShape._id){if(this.targetShape){var c=this.targetShape.eventListeners;c&&(this.mouseoutShape=this.targetShape)}return!0}return!1},_traverseChildren:function(a,b){var c=a.children;for(var d=c.length-1;d>=0;d--){var e=c[d];if(e.getListening())if(e.nodeType==="Shape"){var f=this._detectEvent
+(e,b);if(f)return!0}else{var f=this._traverseChildren(e,b);if(f)return!0}}return!1},_handleStageEvent:function(a){var b=Kinetic.Global;a||(a=window.event),this._setMousePosition(a),this._setTouchPosition(a),this.pathCanvas.clear(),this.targetFound=!1;var c=!1;for(var d=this.children.length-1;d>=0;d--){var e=this.children[d];if(e.isVisible()&&d>=0&&e.getListening()&&this._traverseChildren(e,a)){c=!0;break}}!c&&this.mouseoutShape&&(this.mouseoutShape._handleEvent("mouseout",a),this.mouseoutShape=undefined)},_bindContentEvents:function(){var a=Kinetic.Global,b=this,c=["mousedown","mousemove","mouseup","mouseover","mouseout","touchstart","touchmove","touchend"];for(var d=0;d<c.length;d++){var e=c[d];(function(){var a=e;b.content.addEventListener(a,function(c){b["_"+a](c)},!1)})()}},_mouseover:function(a){this._handleStageEvent(a)},_mouseout:function(a){var b=this.targetShape;b&&(b._handleEvent("mouseout",a),this.targetShape=undefined),this.mousePos=undefined,this._endDrag(a)},_mousemove:function(a){this.mouseDown=!1,this.mouseUp=!1,this.mouseMove=!0,this._handleStageEvent(a),this._startDrag(a)},_mousedown:function(a){this.mouseDown=!0,this.mouseUp=!1,this.mouseMove=!1,this._handleStageEvent(a),this.attrs.draggable&&this._initDrag()},_mouseup:function(a){this.mouseDown=!1,this.mouseUp=!0,this.mouseMove=!1,this._handleStageEvent(a),this.clickStart=!1,this._endDrag(a)},_touchstart:function(a){a.preventDefault(),this.touchStart=!0,this.touchEnd=!1,this.touchMove=!1,this._handleStageEvent(a),this.attrs.draggable&&this._initDrag()},_touchend:function(a){this.touchStart=!1,this.touchEnd=!0,this.touchMove=!1,this._handleStageEvent(a),this.tapStart=!1,this._endDrag(a)},_touchmove:function(a){a.preventDefault(),this.touchEnd=!1,this.touchMove=!0,this._handleStageEvent(a),this._startDrag(a)},_setMousePosition:function(a){var b=a.offsetX||a.clientX-this._getContentPosition().left+window.pageXOffset,c=a.offsetY||a.clientY-this._getContentPosition().top+window.pageYOffset;this.mousePos={x:b,y:c}},_setTouchPosition:function(a){if(a.touches!==undefined&&a.touches.length===1){var b=a.touches[0],c=b.clientX-this._getContentPosition().left+window.pageXOffset,d=b.clientY-this._getContentPosition().top+window.pageYOffset;this.touchPos={x:c,y:d}}},_getContentPosition:function(){var a=this.content.getBoundingClientRect(),b=document.documentElement;return{top:a.top+b.scrollTop,left:a.left+b.scrollLeft}},_endDrag:function(a){var b=Kinetic.Global;b.drag.node&&b.drag.moving&&(b.drag.moving=!1,b.drag.node._handleEvent("dragend",a)),b.drag.node=undefined},_startDrag:function(a){var b=this,c=Kinetic.Global,d=c.drag.node;if(d){var e=d.attrs.dragThrottle,f=(new Date).getTime(),g=f-d.lastDragTime,h=1e3/e;if(g>=h||e>200){var i=b.getUserPosition(),j=d.attrs.dragConstraint,k=d.attrs.dragBounds,l={x:d.attrs.x,y:d.attrs.y},m={x:i.x-c.drag.offset.x,y:i.y-c.drag.offset.y};k.left!==undefined&&m.x<k.left&&(m.x=k.left),k.right!==undefined&&m.x>k.right&&(m.x=k.right),k.top!==undefined&&m.y<k.top&&(m.y=k.top),k.bottom!==undefined&&m.y>k.bottom&&(m.y=k.bottom),d.setAbsolutePosition(m),j==="horizontal"?d.attrs.y=l.y:j==="vertical"&&(d.attrs.x=l.x),c.drag.node.nodeType==="Stage"?c.drag.node.draw():c.drag.node.getLayer().draw(),c.drag.moving||(c.drag.moving=!0,c.drag.node._handleEvent("dragstart",a)),c.drag.node._handleEvent("dragmove",a),d.lastDragTime=(new Date).getTime()}}},_buildDOM:function(){this.content=document.createElement("div"),this.content.style.position="relative",this.content.style.display="inline-block",this.content.className="kineticjs-content",this.attrs.container.appendChild(this.content),this.bufferCanvas=new Kinetic.Canvas({width:this.attrs.width,height:this.attrs.height}),this.pathCanvas=new Kinetic.Canvas({width:this.attrs.width,height:this.attrs.height}),this.pathCanvas.strip(),this._resizeDOM()},_addId:function(a){a.attrs.id!==undefined&&(this.ids[a.attrs.id]=a)},_removeId:function(a){a!==undefined&&delete this.ids[a]},_addName:function(a){var b=a.attrs.name;b!==undefined&&(this.names[b]===undefined&&(this.names[b]=[]),this.names[b].push(a))},_removeName:function(a,b){if(a!==undefined){var c=this.names[a];if(c!==undefined){for(var d=0;d<c.length;d++){var e=c[d];e._id===b&&c.splice(d,1)}c.length===0&&delete this.names[a]}}},_onContent:function(a,b){var c=a.split(" ");for(var d=0;d<c.length;d++){var e=c[d];this.content.addEventListener(e,b,!1)}},_setStageDefaultProperties:function(){this.nodeType="Stage",this.dblClickWindow=400,this.targetShape=undefined,this.targetFound=!1,this.mouseoverShape=undefined,this.mouseoutShape=undefined,this.mousePos=undefined,this.mouseDown=!1,this.mouseUp=!1,this.mouseMove=!1,this.clickStart=!1,this.touchPos=undefined,this.touchStart=!1,this.touchEnd=!1,this.touchMove=!1,this.tapStart=!1,this.ids={},this.names={},this.anim=undefined,this.animRunning=!1},_draw:function(a){this._drawChildren(a)}}),Kinetic.Node.addGettersSetters(Kinetic.Stage,["width","height"]),Kinetic.Layer=Kinetic.Container.extend({init:function(a){this.setDefaultAttrs({clearBeforeDraw:!0}),this.nodeType="Layer",this.lastDrawTime=0,this.beforeDrawFunc=undefined,this.afterDrawFunc=undefined,this.canvas=new Kinetic.Canvas,this.canvas.getElement().style.position="absolute",this._super(a)},draw:function(a){this._draw(a)},beforeDraw:function(a){this.beforeDrawFunc=a},afterDraw:function(a){this.afterDrawFunc=a},getCanvas:function(){return this.canvas},getContext:function(){return this.canvas.context},clear:function(){this.getCanvas().clear()},toDataURL:function(a){var b,c=a&&a.mimeType?a.mimeType:null,d=a&&a.quality?a.quality:null;return a&&a.width&&a.height?b=new Kinetic.Canvas(a.width,a.height):b=this.getCanvas(),b.toDataURL(c,d)},_draw:function(a){a||(a=this.getCanvas());var b=(new Date).getTime();this.lastDrawTime=b,this.beforeDrawFunc!==undefined&&this.beforeDrawFunc.call(this),this.attrs.clearBeforeDraw&&a.clear(),this.isVisible()&&(this.attrs.drawFunc!==undefined&&this.attrs.drawFunc.call(this),this._drawChildren(a)),this.afterDrawFunc!==undefined&&this.afterDrawFunc.call(this)}}),Kinetic.Node.addGettersSetters(Kinetic.Layer,["clearBeforeDraw"]),Kinetic.Group=Kinetic.Container.extend({init:function(a){this.nodeType="Group",this._super(a)},draw:function(a){this._draw(a)},_draw:function(a){this.attrs.visible&&this._drawChildren(a)}}),Kinetic.Shape=Kinetic.Node.extend({init:function(a){this.setDefaultAttrs({detectionType:"path"}),this.nodeType="Shape",this.appliedShadow=!1,this._super(a)},getContext:function(){return this.getLayer().getContext()},getCanvas:function(){return this.getLayer().getCanvas()},stroke:function(a){var b=this.getStrokeWidth(),c=this.getStroke();if(c||b){var d=Kinetic.Global,e=!1;a.save(),this.attrs.shadow&&!this.appliedShadow&&(e=this._applyShadow(a)),a.lineWidth=b||2,a.strokeStyle=c||"black",a.stroke(a),a.restore(),e&&this.stroke(a)}},fill:function(a){var b=!1,c=this.attrs.fill;if(c){a.save(),this.attrs.shadow&&!this.appliedShadow&&(b=this._applyShadow(a));var d=c.start,e=c.end,f=null;if(Kinetic.Type._isString(c))a.fillStyle=c,a.fill(a);else if(c.image){var g=c.repeat?c.repeat:"repeat";c.scale&&a.scale(c.scale.x,c.scale.y),c.offset&&a.translate(c.offset.x,c.offset.y),a.fillStyle=a.createPattern(c.image,g),a.fill(a)}else if(!d.radius&&!e.radius){var h=a.createLinearGradient(d.x,d.y,e.x,e.y),i=c.colorStops;for(var j=0;j<i.length;j+=2)h.addColorStop(i[j],i[j+1]);a.fillStyle=h,a.fill(a)}else if(!d.radius&&d.radius!==0||!e.radius&&e.radius!==0)a.fillStyle="black",a.fill(a);else{var h=a.createRadialGradient(d.x,d.y,d.radius,e.x,e.y,e.radius),i=c.colorStops;for(var j=0;j<i.length;j+=2)h.addColorStop(i[j],i[j+1]);a.fillStyle=h,a.fill(a)}a.restore()}b&&this.fill(a)},fillText:function(a,b){var c=!1;this.attrs.textFill&&(a.save(),this.attrs.shadow&&!this.appliedShadow&&(c=this._applyShadow(a)),a.fillStyle=this.attrs.textFill,a.fillText(b,0,0),a.restore()),c&&this.fillText(a,b,0,0)},strokeText:function(a,b){var c=!1;if(this.attrs.textStroke||this.attrs.textStrokeWidth){a.save(),this.attrs.shadow&&!this.appliedShadow&&(c=this._applyShadow(a));var d=this.attrs.textStroke?this.attrs.textStroke:"black",e=this.attrs.textStrokeWidth?this.attrs.textStrokeWidth:2;a.lineWidth=e,a.strokeStyle=d,a.strokeText(b,0,0),a.restore()}c&&this.strokeText(a,b,0,0)},drawImage:function(){var a=!1,b=arguments[0];b.save();var c=Array.prototype.slice.call(arguments);if(c.length===6||c.length===10)this.attrs.shadow&&!this.appliedShadow&&(a=this._applyShadow(b)),c.length===6?b.drawImage(c[1],c[2],c[3],c[4],c[5]):b.drawImage(c[1],c[2],c[3],c[4],c[5],c[6],c[7],c[8],c[9]);b.restore(),a&&this.drawImage.apply(this,c)},applyLineJoin:function(a){this.attrs.lineJoin&&(a.lineJoin=this.attrs.lineJoin)},_applyShadow:function(a){var b=this.attrs.shadow;if(b){var c=this.getAbsoluteAlpha(),d=b.color?b.color:"black",e=b.blur?b.blur:5,f=b.offset?b.offset:{x:0,y:0};return b.alpha&&(a.globalAlpha=b.alpha*c),a.shadowColor=d,a.shadowBlur=e,a.shadowOffsetX=f.x,a.shadowOffsetY=f.y,this.appliedShadow=!0,!0}return!1},intersects:function(){var a=Kinetic.Type._getXY(Array.prototype.slice.call(arguments)),b=this.getStage();if(this.attrs.detectionType==="path"){var c=b.pathCanvas,d=c.getContext();return this._draw(c),d.isPointInPath(a.x,a.y)}if(this.imageData){var e=b.attrs.width,f=this.imageData.data[(e*a.y+a.x)*4+3];return f}return!1},_draw:function(a){if(this.attrs.drawFunc){var b=this.getStage(),c=a.getContext(),d=[],e=this.parent;d.unshift(this);while(e)d.unshift(e),e=e.parent;c.save();for(var f=0;f<d.length;f++){var g=d[f],h=g.getTransform(),i=h.getMatrix();c.transform(i[0],i[1],i[2],i[3],i[4],i[5])}var j=this.getAbsoluteAlpha();j!==1&&(c.globalAlpha=j),this.applyLineJoin(c),this.appliedShadow=!1,this.attrs.drawFunc.call(this,a.getContext()),c.restore()}}}),Kinetic.Node.addGettersSetters(Kinetic.Shape,["fill","stroke","lineJoin","strokeWidth","shadow","drawFunc","filter"]),Kinetic.Rect=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({width:0,height:0,cornerRadius:0}),this.shapeType="Rect",a.drawFunc=this.drawFunc,this._super(a)},drawFunc:function(a){a.beginPath(),this.attrs.cornerRadius===0?a.rect(0,0,this.attrs.width,this.attrs.height):(a.moveTo(this.attrs.cornerRadius,0),a.lineTo(this.attrs.width-this.attrs.cornerRadius,0),a.arc(this.attrs.width-this.attrs.cornerRadius,this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI*3/2,0,!1),a.lineTo(this.attrs.width,this.attrs.height-this.attrs.cornerRadius),a.arc(this.attrs.width-this.attrs.cornerRadius,this.attrs.height-this.attrs.cornerRadius,this.attrs.cornerRadius,0,Math.PI/2,!1),a.lineTo(this.attrs.cornerRadius,this.attrs.height),a.arc(this.attrs.cornerRadius,this.attrs.height-this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI/2,Math.PI,!1),a.lineTo(0,this.attrs.cornerRadius),a.arc(this.attrs.cornerRadius,this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI,Math.PI*3/2,!1)),a.closePath(),this.fill(a),this.stroke(a)},setSize:function(){var a=Kinetic.Type._getSize(Array.prototype.slice.call(arguments));this.setAttrs(a)},getSize:function(){return{width:this.attrs.width,height:this.attrs.height}}}),Kinetic.Node.addGettersSetters(Kinetic.Rect,["width","height","cornerRadius"]),Kinetic.Ellipse=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({radius:{x:0,y:0}}),this.shapeType="Ellipse",a.drawFunc=this.drawFunc,this._super(a),this._convertRadius();var b=this;this.on("radiusChange.kinetic",function(){b._convertRadius()})},drawFunc:function(a){var b=this.getRadius();a.beginPath(),a.save(),b.x!==b.y&&a.scale(1,b.y/b.x),a.arc(0,0,b.x,0,Math.PI*2,!0),a.restore(),a.closePath(),this.fill(a),this.stroke(a)},_convertRadius:function(){var a=Kinetic.Type,b=this.getRadius();if(a._isObject(b))return!1;this.attrs.radius=a._getXY(b)}}),Kinetic.Circle=Kinetic.Ellipse,Kinetic.Node.addGettersSetters(Kinetic.Ellipse,["radius"]),Kinetic.Image=Kinetic.Shape.extend({init:function(a){this.shapeType="Image",a.drawFunc=this.drawFunc,this._super(a)},drawFunc:function(a){if(this.attrs.image){var b=this.getWidth(),c=this.getHeight();a.beginPath(),a.rect(0,0,b,c),a.closePath(),this.fill(a),this.stroke(a);if(this.attrs.crop&&this.attrs.crop.width&&this.attrs.crop.height){var d=this.attrs.crop.x?this.attrs.crop.x:0,e=this.attrs.crop.y?this.attrs.crop.y:0,f=this.attrs.crop.width,g=this.attrs.crop.height;this.drawImage(a,this.attrs.image,d,e,f,g,0,0,b,c)}else this.drawImage(a,this.attrs.image,0,0,b,c)}},setSize:function(){var a=Kinetic.Type._getSize(Array.prototype.slice.call(arguments));this.setAttrs(a)},getSize:function(){return{width:this.attrs.width,height:this.attrs.height}},getWidth:function(){return this.attrs.width?this.attrs.width:this.attrs.image?this.attrs.image.width:0},getHeight:function(){return this.attrs.height?this.attrs.height:this.attrs.image?this.attrs.image.height:0},applyFilter:function(a){try{var b=this._clearTransform();this.saveImageData(this.getWidth(),this.getHeight()),this._setTransform(b),a.filter.call(this,a);var c=this;Kinetic.Type._getImage(this.getImageData(),function(b){c.setImage(b),a.callback&&a.callback()})}catch(d){Kinetic.Global.warn("Unable to apply filter.")}}}),Kinetic.Node.addGettersSetters(Kinetic.Image,["image","crop","filter"]),Kinetic.Node.addSetters(Kinetic.Image,["width","height"]),Kinetic.Polygon=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({points:[]}),this.shapeType="Polygon",a.drawFunc=this.drawFunc,this._super(a)},drawFunc:function(a){a.beginPath(),a.moveTo(this.attrs.points[0].x,this.attrs.points[0].y);for(var b=1;b<this.attrs.points.length;b++)a.lineTo(this.attrs.points[b].x,this.attrs.points[b].y);a.closePath(),this.fill(a),this.stroke(a)}}),Kinetic.Node.addGettersSetters(Kinetic.Polygon,["points"]),Kinetic.Text=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({fontFamily:"Calibri",text:"",fontSize:12,align:"left",verticalAlign:"top",fontStyle:"normal",padding:0,width:"auto",height:"auto",detectionType:"path",cornerRadius:0,lineHeight:1.2}),this.dummyCanvas=document.createElement("canvas"),this.shapeType="Text",a.drawFunc=this.drawFunc,this._super(a);var b=["width","height","padding","text","textStroke","textStrokeWidth"],c=this;for(var d=0;d<b.length;d++){var e=b[d];this.on(e+"Change.kinetic",c._setTextData)}c._setTextData()},drawFunc:function(a){a.beginPath();var b=this.getBoxWidth(),c=this.getBoxHeight();this.attrs.cornerRadius===0?a.rect(0,0,b,c):(a.moveTo(this.attrs.cornerRadius,0),a.lineTo(b-this.attrs.cornerRadius,0),a.arc(b-this.attrs.cornerRadius,this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI*3/2,0,!1),a.lineTo(b,c-this.attrs.cornerRadius),a.arc(b-this.attrs.cornerRadius,c-this.attrs.cornerRadius,this.attrs.cornerRadius,0,Math.PI/2,!1),a.lineTo(this.attrs.cornerRadius,c),a.arc(this.attrs.cornerRadius,c-this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI/2,Math.PI,!1),a.lineTo(0,this.attrs.cornerRadius),a.arc(this.attrs.cornerRadius,this.attrs.cornerRadius,this.attrs.cornerRadius,Math.PI,Math.PI*3/2,!1)),a.closePath(),this.fill(a),this.stroke(a);var d=this.attrs.padding,e=this.attrs.lineHeight*this.getTextHeight(),f=this.textArr;a.font=this.attrs.fontStyle+" "+this.attrs.fontSize+"pt "+this.attrs.fontFamily,a.textBaseline="middle",a.textAlign="left",a.save(),a.translate(d,0),a.translate(0,d+this.getTextHeight()/2);for(var g=0;g<f.length;g++){var h=f[g];a.save(),this.attrs.align==="right"?a.translate(this.getBoxWidth()-this._getTextSize(h).width-d*2,0):this.attrs.align==="center"&&a.translate((this.getBoxWidth()-this._getTextSize(h).width-d*2)/2,0),this.fillText(a,h),this.strokeText(a,h),a.restore(),a.translate(0,e)}a.restore()},getBoxWidth:function(){return this.attrs.width==="auto"?this.getTextWidth()+this.attrs.padding*2:this.attrs.width},getBoxHeight:function(){return this.attrs.height==="auto"?this.getTextHeight()*this.textArr.length*this.attrs.lineHeight+this.attrs.padding*2:this.attrs.height},getTextWidth:function(){return this.textWidth},getTextHeight:function(){return this.textHeight},_getTextSize:function(a){var b=this.dummyCanvas,c=b.getContext("2d");c.save(),c.font=this.attrs.fontStyle+" "+this.attrs.fontSize+"pt "+this.attrs.fontFamily;var d=c.measureText(a);return c.restore(),{width:d.width,height:parseInt(this.attrs.fontSize,10)}},_setTextData:function(){var a=this.attrs.text.split(""),b=[],c=0,d=!0;this.textWidth=0,this.textHeight=this._getTextSize(this.attrs.text).height;var e=this.attrs.lineHeight*this.textHeight;while(a.length>0&&d&&(this.attrs.height==="auto"||e*(c+1)<this.attrs.height-this.attrs.padding*2)){var f=0,g=undefined;d=!1;while(f<a.length){if(a.indexOf("\n")===f){a.splice(f,1),g=a.splice(0,f).join("");break}var h=a.slice(0,f);if(this.attrs.width!=="auto"&&this._getTextSize(h.join("")).width>this.attrs.width-this.attrs.padding*2){if(f==0)break;var i=h.lastIndexOf(" "),j=h.lastIndexOf("-"),k=Math.max(i,j);if(k>=0){g=a.splice(0,1+k).join("");break}g=a.splice(0,f).join("");break}f++,f===a.length&&(g=a.splice(0,f).join(""))}this.textWidth=Math.max(this.textWidth,this._getTextSize(g).width),g!==undefined&&(b.push(g),d=!0),c++}this.textArr=b}}),Kinetic.Node.addGettersSetters(Kinetic.Text,["fontFamily","fontSize","fontStyle","textFill","textStroke","textStrokeWidth","padding","align","lineHeight","text","width","height","cornerRadius","fill","stroke","strokeWidth","shadow"]),Kinetic.Line=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({points:[],lineCap:"butt",dashArray:[],detectionType:"pixel"}),this.shapeType="Line",a.drawFunc=this.drawFunc,this._super(a)},drawFunc:function(a){var b={};a.beginPath(),a.moveTo(this.attrs.points[0].x,this.attrs.points[0].y);for(var c=1;c<this.attrs.points.length;c++){var d=this.attrs.points[c].x,e=this.attrs.points[c].y;if(this.attrs.dashArray.length>0){var f=this.attrs.points[c-1].x,g=this.attrs.points[c-1].y;this._dashedLine(a,f,g,d,e,this.attrs.dashArray)}else a.lineTo(d,e)}!this.attrs.lineCap||(a.lineCap=this.attrs.lineCap),this.stroke(a)},_dashedLine:function(a,b,c,d,e,f){var g=f.length,h=d-b,i=e-c,j=h>i,k=j?i/h:h/i;k>9999?k=9999:k<-9999&&(k=-9999);var l=Math.sqrt(h*h+i*i),m=0,n=!0;while(l>=.1&&m<1e4){var o=f[m++%g];o===0&&(o=.001),o>l&&(o=l);var p=Math.sqrt(o*o/(1+k*k));j?(b+=h<0&&i<0?p*-1:p,c+=h<0&&i<0?k*p*-1:k*p):(b+=h<0&&i<0?k*p*-1:k*p,c+=h<0&&i<0?p*-1:p),a[n?"lineTo":"moveTo"](b,c),l-=o,n=!n}a.moveTo(d,e)}}),Kinetic.Node.addGettersSetters(Kinetic.Line,["dashArray","lineCap","points"]),Kinetic.Sprite=Kinetic.Shape.extend({init:function(a){this.setDefaultAttrs({index:0,frameRate:17}),a.drawFunc=this.drawFunc,this._super(a);var b=this;this.on("animationChange.kinetic",function(){b.setIndex(0)})},drawFunc:function(a){if(this.attrs.image){var b=this.attrs.animation,c=this.attrs.index,d=this.attrs.animations[b][c];a.beginPath(),a.rect(0,0,d.width,d.height),a.closePath(),this.drawImage(a,this.attrs.image,d.x,d.y,d.width,d.height,0,0,d.width,d.height)}},start:function(){var a=this,b=this.getLayer(),c=Kinetic.Animation;this.anim&&(c._removeAnimation(this.anim),this.anim=null),this.anim={node:b},c._addAnimation(this.anim),this.interval=setInterval(function(){var b=a.attrs.index;a._updateIndex(),a.afterFrameFunc&&b===a.afterFrameIndex&&a.afterFrameFunc()},1e3/this.attrs.frameRate),c._handleAnimation()},stop:function(){var a=Kinetic.Animation;this.anim&&(a._removeAnimation(this.anim),this.anim=null),clearInterval(this.interval)},afterFrame:function(a,b){this.afterFrameIndex=a,this.afterFrameFunc=b},_updateIndex:function(){var a=this.attrs.index,b=this.attrs.animation;a<this.attrs.animations[b].length-1?this.attrs.index++:this.attrs.index=0}}),Kinetic.Node.addGettersSetters(Kinetic.Sprite,["animation","animations","index"]);
diff --git a/src/plugins/shapes/Path.js b/src/plugins/shapes/Path.js
index 70d9f013..21ad6906 100644
--- a/src/plugins/shapes/Path.js
+++ b/src/plugins/shapes/Path.js
@@ -15,14 +15,11 @@ Kinetic.Plugins.Path = Kinetic.Shape.extend({
         var that = this;
 
         config.drawFunc = this.drawFunc;
-
         // call super constructor
         this._super(config);
-
-        this.dataArray = Kinetic.Plugins.PathHelper.parsePathData(this.attrs.data);
-
+        this.dataArray = this.parsePathData(this.attrs.data);
         this.on('dataChange', function() {
-            that.dataArray = Kinetic.Plugins.PathHelper.parsePathData(that.attrs.data);
+            that.dataArray = this.parsePathData(that.attrs.data);
         });
     },
     drawFunc: function(context) {
@@ -68,6 +65,368 @@ Kinetic.Plugins.Path = Kinetic.Shape.extend({
         }
         this.fill(context);
         this.stroke(context);
+    },
+    /**
+     * get parsed data array from the data
+     *  string.  V, v, H, h, and l data are converted to
+     *  L data for the purpose of high performance Path
+     *  rendering
+     */
+    parsePathData: function(data) {
+        // Path Data Segment must begin with a moveTo
+        //m (x y)+  Relative moveTo (subsequent points are treated as lineTo)
+        //M (x y)+  Absolute moveTo (subsequent points are treated as lineTo)
+        //l (x y)+  Relative lineTo
+        //L (x y)+  Absolute LineTo
+        //h (x)+    Relative horizontal lineTo
+        //H (x)+    Absolute horizontal lineTo
+        //v (y)+    Relative vertical lineTo
+        //V (y)+    Absolute vertical lineTo
+        //z (closepath)
+        //Z (closepath)
+        //c (x1 y1 x2 y2 x y)+ Relative Bezier curve
+        //C (x1 y1 x2 y2 x y)+ Absolute Bezier curve
+        //q (x1 y1 x y)+       Relative Quadratic Bezier
+        //Q (x1 y1 x y)+       Absolute Quadratic Bezier
+        //t (x y)+    Shorthand/Smooth Relative Quadratic Bezier
+        //T (x y)+    Shorthand/Smooth Absolute Quadratic Bezier
+        //s (x2 y2 x y)+       Shorthand/Smooth Relative Bezier curve
+        //S (x2 y2 x y)+       Shorthand/Smooth Absolute Bezier curve
+        //a (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+     Relative Elliptical Arc
+        //A (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+  Absolute Elliptical Arc
+
+        // return early if data is not defined
+        if(!data) {
+            return [];
+        }
+
+        // command string
+        var cs = data;
+
+        // command chars
+        var cc = ['m', 'M', 'l', 'L', 'v', 'V', 'h', 'H', 'z', 'Z', 'c', 'C', 'q', 'Q', 't', 'T', 's', 'S', 'a', 'A'];
+        // convert white spaces to commas
+        cs = cs.replace(new RegExp(' ', 'g'), ',');
+        // create pipes so that we can split the data
+        for(var n = 0; n < cc.length; n++) {
+            cs = cs.replace(new RegExp(cc[n], 'g'), '|' + cc[n]);
+        }
+        // create array
+        var arr = cs.split('|');
+        var ca = [];
+        // init context point
+        var cpx = 0;
+        var cpy = 0;
+        for(var n = 1; n < arr.length; n++) {
+            var str = arr[n];
+            var c = str.charAt(0);
+            str = str.slice(1);
+            // remove ,- for consistency
+            str = str.replace(new RegExp(',-', 'g'), '-');
+            // add commas so that it's easy to split
+            str = str.replace(new RegExp('-', 'g'), ',-');
+            str = str.replace(new RegExp('e,-', 'g'), 'e-');
+            var p = str.split(',');
+            if(p.length > 0 && p[0] === '') {
+                p.shift();
+            }
+            // convert strings to floats
+            for(var i = 0; i < p.length; i++) {
+                p[i] = parseFloat(p[i]);
+            }
+            while(p.length > 0) {
+                if(isNaN(p[0]))// case for a trailing comma before next command
+                    break;
+
+                var cmd = null;
+                var points = [];
+                var startX = cpx, startY = cpy;
+
+                // convert l, H, h, V, and v to L
+                switch (c) {
+
+                    // Note: Keep the lineTo's above the moveTo's in this switch
+                    case 'l':
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'L';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'L':
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        points.push(cpx, cpy);
+                        break;
+
+                    // Note: lineTo handlers need to be above this point
+                    case 'm':
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'M';
+                        points.push(cpx, cpy);
+                        c = 'l';
+                        // subsequent points are treated as relative lineTo
+                        break;
+                    case 'M':
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        cmd = 'M';
+                        points.push(cpx, cpy);
+                        c = 'L';
+                        // subsequent points are treated as absolute lineTo
+                        break;
+
+                    case 'h':
+                        cpx += p.shift();
+                        cmd = 'L';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'H':
+                        cpx = p.shift();
+                        cmd = 'L';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'v':
+                        cpy += p.shift();
+                        cmd = 'L';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'V':
+                        cpy = p.shift();
+                        cmd = 'L';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'C':
+                        points.push(p.shift(), p.shift(), p.shift(), p.shift());
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        points.push(cpx, cpy);
+                        break;
+                    case 'c':
+                        points.push(cpx + p.shift(), cpy + p.shift(), cpx + p.shift(), cpy + p.shift());
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'C';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'S':
+                        var ctlPtx = cpx, ctlPty = cpy;
+                        var prevCmd = ca[ca.length - 1];
+                        if(prevCmd.command === 'C') {
+                            ctlPtx = cpx + (cpx - prevCmd.points[2]);
+                            ctlPty = cpy + (cpy - prevCmd.points[3]);
+                        }
+                        points.push(ctlPtx, ctlPty, p.shift(), p.shift());
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        cmd = 'C';
+                        points.push(cpx, cpy);
+                        break;
+                    case 's':
+                        var ctlPtx = cpx, ctlPty = cpy;
+                        var prevCmd = ca[ca.length - 1];
+                        if(prevCmd.command === 'C') {
+                            ctlPtx = cpx + (cpx - prevCmd.points[2]);
+                            ctlPty = cpy + (cpy - prevCmd.points[3]);
+                        }
+                        points.push(ctlPtx, ctlPty, cpx + p.shift(), cpy + p.shift());
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'C';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'Q':
+                        points.push(p.shift(), p.shift());
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        points.push(cpx, cpy);
+                        break;
+                    case 'q':
+                        points.push(cpx + p.shift(), cpy + p.shift());
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'Q';
+                        points.push(cpx, cpy);
+                        break;
+                    case 'T':
+                        var ctlPtx = cpx, ctlPty = cpy;
+                        var prevCmd = ca[ca.length - 1];
+                        if(prevCmd.command === 'Q') {
+                            ctlPtx = cpx + (cpx - prevCmd.points[0]);
+                            ctlPty = cpy + (cpy - prevCmd.points[1]);
+                        }
+                        cpx = p.shift();
+                        cpy = p.shift();
+                        cmd = 'Q';
+                        points.push(ctlPtx, ctlPty, cpx, cpy);
+                        break;
+                    case 't':
+                        var ctlPtx = cpx, ctlPty = cpy;
+                        var prevCmd = ca[ca.length - 1];
+                        if(prevCmd.command === 'Q') {
+                            ctlPtx = cpx + (cpx - prevCmd.points[0]);
+                            ctlPty = cpy + (cpy - prevCmd.points[1]);
+                        }
+                        cpx += p.shift();
+                        cpy += p.shift();
+                        cmd = 'Q';
+                        points.push(ctlPtx, ctlPty, cpx, cpy);
+                        break;
+                    case 'A':
+                        var rx = p.shift(), ry = p.shift(), psi = p.shift(), fa = p.shift(), fs = p.shift();
+                        var x1 = cpx, y1 = cpy; cpx = p.shift(), cpy = p.shift();
+                        cmd = 'A';
+                        points = this.convertEndpointToCenterParameterization(x1, y1, cpx, cpy, fa, fs, rx, ry, psi);
+                        break;
+                    case 'a':
+                        var rx = p.shift(), ry = p.shift(), psi = p.shift(), fa = p.shift(), fs = p.shift();
+                        var x1 = cpx, y1 = cpy; cpx += p.shift(), cpy += p.shift();
+                        cmd = 'A';
+                        points = this.convertEndpointToCenterParameterization(x1, y1, cpx, cpy, fa, fs, rx, ry, psi);
+                        break;
+                }
+
+                ca.push({
+                    command: cmd || c,
+                    points: points,
+                    start: {
+                        x: startX,
+                        y: startY
+                    },
+                    pathLength: this.calcLength(startX, startY, cmd || c, points)
+                });
+            }
+
+            if(c === 'z' || c === 'Z')
+                ca.push({
+                    command: 'z',
+                    points: [],
+                    start: undefined,
+                    pathLength: 0
+                });
+        }
+
+        return ca;
+    },
+    calcLength: function(x, y, cmd, points) {
+        var len, p1, p2;
+        var g = Kinetic.Geometry;
+
+        switch (cmd) {
+            case 'L':
+                return g.getLineLength(x, y, points[0], points[1]);
+            case 'C':
+                // Approximates by breaking curve into 100 line segments
+                len = 0.0;
+                p1 = g.getPointOnCubicBezier(0, x, y, points[0], points[1], points[2], points[3], points[4], points[5]);
+                for( t = 0.01; t <= 1; t += 0.01) {
+                    p2 = g.getPointOnCubicBezier(t, x, y, points[0], points[1], points[2], points[3], points[4], points[5]);
+                    len += g.getLineLength(p1.x, p1.y, p2.x, p2.y);
+                    p1 = p2;
+                }
+                return len;
+            case 'Q':
+                // Approximates by breaking curve into 100 line segments
+                len = 0.0;
+                p1 = g.getPointOnQuadraticBezier(0, x, y, points[0], points[1], points[2], points[3]);
+                for( t = 0.01; t <= 1; t += 0.01) {
+                    p2 = g.getPointOnQuadraticBezier(t, x, y, points[0], points[1], points[2], points[3]);
+                    len += g.getLineLength(p1.x, p1.y, p2.x, p2.y);
+                    p1 = p2;
+                }
+                return len;
+            case 'A':
+                // Approximates by breaking curve into line segments
+                len = 0.0;
+                var start = points[4];
+                // 4 = theta
+                var dTheta = points[5];
+                // 5 = dTheta
+                var end = points[4] + dTheta;
+                var inc = Math.PI / 180.0;
+                // 1 degree resolution
+                if(Math.abs(start - end) < inc) {
+                    inc = Math.abs(start - end);
+                }
+                // Note: for purpose of calculating arc length, not going to worry about rotating X-axis by angle psi
+                p1 = g.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], start, 0);
+                if(dTheta < 0) {// clockwise
+                    for( t = start - inc; t > end; t -= inc) {
+                        p2 = g.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], t, 0);
+                        len += g.getLineLength(p1.x, p1.y, p2.x, p2.y);
+                        p1 = p2;
+                    }
+                }
+                else {// counter-clockwise
+                    for( t = start + inc; t < end; t += inc) {
+                        p2 = g.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], t, 0);
+                        len += g.getLineLength(p1.x, p1.y, p2.x, p2.y);
+                        p1 = p2;
+                    }
+                }
+                p2 = g.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], end, 0);
+                len += g.getLineLength(p1.x, p1.y, p2.x, p2.y);
+
+                return len;
+        }
+
+        return 0;
+    },
+    convertEndpointToCenterParameterization: function(x1, y1, x2, y2, fa, fs, rx, ry, psiDeg) {
+        // Derived from: http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes
+        var psi = psiDeg * (Math.PI / 180.0);
+        var xp = Math.cos(psi) * (x1 - x2) / 2.0 + Math.sin(psi) * (y1 - y2) / 2.0;
+        var yp = -1 * Math.sin(psi) * (x1 - x2) / 2.0 + Math.cos(psi) * (y1 - y2) / 2.0;
+
+        var lambda = (xp * xp) / (rx * rx) + (yp * yp) / (ry * ry);
+
+        if(lambda > 1) {
+            rx *= Math.sqrt(lambda);
+            ry *= Math.sqrt(lambda);
+        }
+
+        var f = Math.sqrt((((rx * rx) * (ry * ry)) - ((rx * rx) * (yp * yp)) - ((ry * ry) * (xp * xp))) / ((rx * rx) * (yp * yp) + (ry * ry) * (xp * xp)));
+
+        if(fa == fs) {
+            f *= -1;
+        }
+        if(isNaN(f)) {
+            f = 0;
+        }
+
+        var cxp = f * rx * yp / ry;
+        var cyp = f * -ry * xp / rx;
+
+        var cx = (x1 + x2) / 2.0 + Math.cos(psi) * cxp - Math.sin(psi) * cyp;
+        var cy = (y1 + y2) / 2.0 + Math.sin(psi) * cxp + Math.cos(psi) * cyp;
+
+        var vMag = function(v) {
+            return Math.sqrt(v[0] * v[0] + v[1] * v[1]);
+        };
+        var vRatio = function(u, v) {
+            return (u[0] * v[0] + u[1] * v[1]) / (vMag(u) * vMag(v));
+        };
+        var vAngle = function(u, v) {
+            return (u[0] * v[1] < u[1] * v[0] ? -1 : 1) * Math.acos(vRatio(u, v));
+        };
+        var theta = vAngle([1, 0], [(xp - cxp) / rx, (yp - cyp) / ry]);
+        var u = [(xp - cxp) / rx, (yp - cyp) / ry];
+        var v = [(-1 * xp - cxp) / rx, (-1 * yp - cyp) / ry];
+        var dTheta = vAngle(u, v);
+
+        if(vRatio(u, v) <= -1) {
+            dTheta = Math.PI;
+        }
+        if(vRatio(u, v) >= 1) {
+            dTheta = 0;
+        }
+        if(fs === 0 && dTheta > 0) {
+            dTheta = dTheta - 2 * Math.PI;
+        }
+        if(fs == 1 && dTheta < 0) {
+            dTheta = dTheta + 2 * Math.PI;
+        }
+        return [cx, cy, rx, ry, theta, dTheta, psi, fs];
     }
 });
 
diff --git a/src/plugins/shapes/TextPath.js b/src/plugins/shapes/TextPath.js
index 01b32636..2bec925c 100644
--- a/src/plugins/shapes/TextPath.js
+++ b/src/plugins/shapes/TextPath.js
@@ -10,7 +10,6 @@
  */
 Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
     init: function(config) {
-
         this.setDefaultAttrs({
             fontFamily: 'Calibri',
             fontSize: 12,
@@ -25,14 +24,11 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
         var that = this;
 
         config.drawFunc = this.drawFunc;
-
         // call super constructor
         this._super(config);
-
-        this.dataArray = Kinetic.Plugins.PathHelper.parsePathData(this.attrs.data);
-
+        this.dataArray = this.parsePathData(this.attrs.data);
         this.on('dataChange', function() {
-            that.dataArray = Kinetic.Plugins.PathHelper.parsePathData(that.attrs.data);
+            that.dataArray = this.parsePathData(this.attrs.data);
         });
         // update text data for certain attr changes
         var attrs = ['text', 'textStroke', 'textStrokeWidth'];
@@ -40,7 +36,6 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
             var attr = attrs[n];
             this.on(attr + 'Change', that._setTextData);
         }
-
         that._setTextData();
     },
     drawFunc: function(context) {
@@ -83,6 +78,9 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
 
         context.restore();
     },
+    parsePathData: Kinetic.Plugins.Path.prototype.parsePathData,
+    calcLength: Kinetic.Plugins.Path.prototype.calcLength,
+    convertEndpointToCenterParameterization: Kinetic.Plugins.Path.prototype.convertEndpointToCenterParameterization,
     /**
      * get text width in pixels
      * @name getTextWidth
@@ -181,8 +179,8 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
 
                 switch (pathCmd.command) {
                     case 'L':
-                        if(Kinetic.Plugins.PathHelper.getLineLength(p0.x, p0.y, pathCmd.points[0], pathCmd.points[1]) > glyphWidth) {
-                            p1 = Kinetic.Plugins.PathHelper.getPointOnLine(glyphWidth, p0.x, p0.y, pathCmd.points[0], pathCmd.points[1], p0.x, p0.y);
+                        if(Kinetic.Geometry.getLineLength(p0.x, p0.y, pathCmd.points[0], pathCmd.points[1]) > glyphWidth) {
+                            p1 = Kinetic.Geometry.getPointOnLine(glyphWidth, p0.x, p0.y, pathCmd.points[0], pathCmd.points[1], p0.x, p0.y);
                         }
                         else
                             pathCmd = undefined;
@@ -207,7 +205,7 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
                             currentT = end;
                             needNewSegment = true;
                         }
-                        p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3], currentT, pathCmd.points[6]);
+                        p1 = Kinetic.Geometry.getPointOnEllipticalArc(pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3], currentT, pathCmd.points[6]);
                         break;
                     case 'C':
                         if(currentT === 0) {
@@ -225,7 +223,7 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
                             currentT = 1.0;
                             needNewSegment = true;
                         }
-                        p1 = Kinetic.Plugins.PathHelper.getPointOnCubicBezier(currentT, pathCmd.start.x, pathCmd.start.y, pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3], pathCmd.points[4], pathCmd.points[5]);
+                        p1 = Kinetic.Geometry.getPointOnCubicBezier(currentT, pathCmd.start.x, pathCmd.start.y, pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3], pathCmd.points[4], pathCmd.points[5]);
                         break;
                     case 'Q':
                         if(currentT === 0)
@@ -239,13 +237,13 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
                             currentT = 1.0;
                             needNewSegment = true;
                         }
-                        p1 = Kinetic.Plugins.PathHelper.getPointOnQuadraticBezier(currentT, pathCmd.start.x, pathCmd.start.y, pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3]);
+                        p1 = Kinetic.Geometry.getPointOnQuadraticBezier(currentT, pathCmd.start.x, pathCmd.start.y, pathCmd.points[0], pathCmd.points[1], pathCmd.points[2], pathCmd.points[3]);
                         break;
 
                 }
 
                 if(p1 !== undefined) {
-                    currLen = Kinetic.Plugins.PathHelper.getLineLength(p0.x, p0.y, p1.x, p1.y);
+                    currLen = Kinetic.Geometry.getLineLength(p0.x, p0.y, p1.x, p1.y);
                 }
 
                 if(needNewSegment) {
@@ -262,7 +260,7 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
             if(p0 === undefined || p1 === undefined)
                 break;
 
-            var width = Kinetic.Plugins.PathHelper.getLineLength(p0.x, p0.y, p1.x, p1.y);
+            var width = Kinetic.Geometry.getLineLength(p0.x, p0.y, p1.x, p1.y);
 
             // Note: Since glyphs are rendered one at a time, any kerning pair data built into the font will not be used.
             // Can foresee having a rough pair table built in that the developer can override as needed.
@@ -270,7 +268,7 @@ Kinetic.Plugins.TextPath = Kinetic.Shape.extend({
             var kern = 0;
             // placeholder for future implementation
 
-            var midpoint = Kinetic.Plugins.PathHelper.getPointOnLine(kern + width / 2.0, p0.x, p0.y, p1.x, p1.y);
+            var midpoint = Kinetic.Geometry.getPointOnLine(kern + width / 2.0, p0.x, p0.y, p1.x, p1.y);
 
             var rotation = Math.atan2((p1.y - p0.y), (p1.x - p0.x));
             this.glyphInfo.push({
diff --git a/src/plugins/util/PathHelper.js b/src/plugins/util/PathHelper.js
deleted file mode 100644
index 9c653471..00000000
--- a/src/plugins/util/PathHelper.js
+++ /dev/null
@@ -1,495 +0,0 @@
-///////////////////////////////////////////////////////////////////////
-//  PathHelper
-///////////////////////////////////////////////////////////////////////
-Kinetic.Plugins.PathHelper = {
-    
-    /**
-     * get parsed data array from the data
-     *  string.  V, v, H, h, and l data are converted to
-     *  L data for the purpose of high performance Path
-     *  rendering
-     */
-    parsePathData : function (data) {
-        
-        // Path Data Segment must begin with a moveTo
-        //m (x y)+  Relative moveTo (subsequent points are treated as lineTo)
-        //M (x y)+  Absolute moveTo (subsequent points are treated as lineTo)
-        //l (x y)+  Relative lineTo
-        //L (x y)+  Absolute LineTo
-        //h (x)+    Relative horizontal lineTo
-        //H (x)+    Absolute horizontal lineTo
-        //v (y)+    Relative vertical lineTo
-        //V (y)+    Absolute vertical lineTo
-        //z (closepath)
-        //Z (closepath)
-        //c (x1 y1 x2 y2 x y)+ Relative Bezier curve
-        //C (x1 y1 x2 y2 x y)+ Absolute Bezier curve
-        //q (x1 y1 x y)+       Relative Quadratic Bezier
-        //Q (x1 y1 x y)+       Absolute Quadratic Bezier
-        //t (x y)+    Shorthand/Smooth Relative Quadratic Bezier
-        //T (x y)+    Shorthand/Smooth Absolute Quadratic Bezier
-        //s (x2 y2 x y)+       Shorthand/Smooth Relative Bezier curve
-        //S (x2 y2 x y)+       Shorthand/Smooth Absolute Bezier curve
-        //a (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+     Relative Elliptical Arc
-        //A (rx ry x-axis-rotation large-arc-flag sweep-flag x y)+  Absolute Elliptical Arc
-        
-        // return early if data is not defined
-        if (!data) {
-            return [];
-        }        
-		
-		// command string
-        var cs = data;
-        
-        // command chars
-        var cc = ['m', 'M', 'l', 'L', 'v', 'V', 'h', 'H', 'z', 'Z', 'c', 'C', 'q', 'Q', 't', 'T', 's', 'S', 'a', 'A'];
-        // convert white spaces to commas
-        cs = cs.replace(new RegExp(' ', 'g'), ',');
-        // create pipes so that we can split the data
-        for (var n = 0; n < cc.length; n++) {
-            cs = cs.replace(new RegExp(cc[n], 'g'), '|' + cc[n]);
-        }
-        // create array
-        var arr = cs.split('|');
-        var ca = [];
-        // init context point
-        var cpx = 0;
-        var cpy = 0;
-        for (var n = 1; n < arr.length; n++) {
-            var str = arr[n];
-            var c = str.charAt(0);
-            str = str.slice(1);
-            // remove ,- for consistency
-            str = str.replace(new RegExp(',-', 'g'), '-');
-            // add commas so that it's easy to split
-            str = str.replace(new RegExp('-', 'g'), ',-');
-            str = str.replace(new RegExp('e,-', 'g'), 'e-');
-            var p = str.split(',');
-            if (p.length > 0 && p[0] === '') {
-                p.shift();
-            }
-            // convert strings to floats
-            for (var i = 0; i < p.length; i++) {
-                p[i] = parseFloat(p[i]);
-            }
-            while (p.length > 0) {
-                if (isNaN(p[0])) // case for a trailing comma before next command
-                    break;
-                
-                var cmd = null;
-                var points = [];
-                var startX = cpx,
-                startY = cpy;
-                
-                // convert l, H, h, V, and v to L
-                switch (c) {
-                    
-                    // Note: Keep the lineTo's above the moveTo's in this switch
-                case 'l':
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'L';
-                    points.push(cpx, cpy);
-                    break;
-                case 'L':
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    points.push(cpx, cpy);
-                    break;
-                    
-                    // Note: lineTo handlers need to be above this point
-                case 'm':
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'M';
-                    points.push(cpx, cpy);
-                    c = 'l';
-                    // subsequent points are treated as relative lineTo
-                    break;
-                case 'M':
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    cmd = 'M';
-                    points.push(cpx, cpy);
-                    c = 'L';
-                    // subsequent points are treated as absolute lineTo
-                    break;
-                    
-                case 'h':
-                    cpx += p.shift();
-                    cmd = 'L';
-                    points.push(cpx, cpy);
-                    break;
-                case 'H':
-                    cpx = p.shift();
-                    cmd = 'L';
-                    points.push(cpx, cpy);
-                    break;
-                case 'v':
-                    cpy += p.shift();
-                    cmd = 'L';
-                    points.push(cpx, cpy);
-                    break;
-                case 'V':
-                    cpy = p.shift();
-                    cmd = 'L';
-                    points.push(cpx, cpy);
-                    break;
-                case 'C':
-                    points.push(p.shift(), p.shift(), p.shift(), p.shift());
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    points.push(cpx, cpy);
-                    break;
-                case 'c':
-                    points.push(cpx + p.shift(), cpy + p.shift(), cpx + p.shift(), cpy + p.shift());
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'C';
-                    points.push(cpx, cpy);
-                    break;
-                case 'S':
-                    var ctlPtx = cpx,
-                    ctlPty = cpy;
-                    var prevCmd = ca[ca.length - 1];
-                    if (prevCmd.command === 'C') {
-                        ctlPtx = cpx + (cpx - prevCmd.points[2]);
-                        ctlPty = cpy + (cpy - prevCmd.points[3]);
-                    }
-                    points.push(ctlPtx, ctlPty, p.shift(), p.shift());
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    cmd = 'C';
-                    points.push(cpx, cpy);
-                    break;
-                case 's':
-                    var ctlPtx = cpx,
-                    ctlPty = cpy;
-                    var prevCmd = ca[ca.length - 1];
-                    if (prevCmd.command === 'C') {
-                        ctlPtx = cpx + (cpx - prevCmd.points[2]);
-                        ctlPty = cpy + (cpy - prevCmd.points[3]);
-                    }
-                    points.push(ctlPtx, ctlPty, cpx + p.shift(), cpy + p.shift());
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'C';
-                    points.push(cpx, cpy);
-                    break;
-                case 'Q':
-                    points.push(p.shift(), p.shift());
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    points.push(cpx, cpy);
-                    break;
-                case 'q':
-                    points.push(cpx + p.shift(), cpy + p.shift());
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'Q';
-                    points.push(cpx, cpy);
-                    break;
-                case 'T':
-                    var ctlPtx = cpx,
-                    ctlPty = cpy;
-                    var prevCmd = ca[ca.length - 1];
-                    if (prevCmd.command === 'Q') {
-                        ctlPtx = cpx + (cpx - prevCmd.points[0]);
-                        ctlPty = cpy + (cpy - prevCmd.points[1]);
-                    }
-                    cpx = p.shift();
-                    cpy = p.shift();
-                    cmd = 'Q';
-                    points.push(ctlPtx, ctlPty, cpx, cpy);
-                    break;
-                case 't':
-                    var ctlPtx = cpx,
-                    ctlPty = cpy;
-                    var prevCmd = ca[ca.length - 1];
-                    if (prevCmd.command === 'Q') {
-                        ctlPtx = cpx + (cpx - prevCmd.points[0]);
-                        ctlPty = cpy + (cpy - prevCmd.points[1]);
-                    }
-                    cpx += p.shift();
-                    cpy += p.shift();
-                    cmd = 'Q';
-                    points.push(ctlPtx, ctlPty, cpx, cpy);
-                    break;
-                case 'A':
-                    var rx = p.shift(),
-                    ry = p.shift(),
-                    psi = p.shift(),
-                    fa = p.shift(),
-                    fs = p.shift();
-                    var x1 = cpx,
-                    y1 = cpy;
-                    cpx = p.shift(),
-                    cpy = p.shift();
-                    cmd = 'A';
-                    points = this.convertEndpointToCenterParameterization(x1, y1, cpx, cpy, fa, fs, rx, ry, psi);
-                    break;
-                case 'a':
-                    var rx = p.shift(),
-                    ry = p.shift(),
-                    psi = p.shift(),
-                    fa = p.shift(),
-                    fs = p.shift();
-                    var x1 = cpx,
-                    y1 = cpy;
-                    cpx += p.shift(),
-                    cpy += p.shift();
-                    cmd = 'A';
-                    points = this.convertEndpointToCenterParameterization(x1, y1, cpx, cpy, fa, fs, rx, ry, psi);
-                    break;
-                }
-                
-                ca.push({
-                    command : cmd || c,
-                    points : points,
-                    start : {
-                        x : startX,
-                        y : startY
-                    },
-                    pathLength : this.calcLength(startX, startY, cmd || c, points)
-                });
-                
-            }
-            
-            if (c === 'z' || c === 'Z')
-                ca.push({
-                    command : 'z',
-                    points : [],
-                    start : undefined,
-                    pathLength : 0
-                });
-        }
-        
-        return ca;
-    },
-    calcLength : function (x, y, cmd, points) {
-        var len,
-        p1,
-        p2;
-        
-        switch (cmd) {
-        case 'L':
-            return this.getLineLength(x, y, points[0], points[1]);
-        case 'C':
-            // Approximates by breaking curve into 100 line segments
-            len = 0.0;
-            p1 = this.getPointOnCubicBezier(0, x, y, points[0], points[1], points[2], points[3], points[4], points[5]);
-            for (t = 0.01; t <= 1; t += 0.01) {
-                p2 = this.getPointOnCubicBezier(t, x, y, points[0], points[1], points[2], points[3], points[4], points[5]);
-                len += this.getLineLength(p1.x, p1.y, p2.x, p2.y);
-                p1 = p2;
-            }
-            return len;
-        case 'Q':
-            // Approximates by breaking curve into 100 line segments
-            len = 0.0;
-            p1 = this.getPointOnQuadraticBezier(0, x, y, points[0], points[1], points[2], points[3]);
-            for (t = 0.01; t <= 1; t += 0.01) {
-                p2 = this.getPointOnQuadraticBezier(t, x, y, points[0], points[1], points[2], points[3]);
-                len += this.getLineLength(p1.x, p1.y, p2.x, p2.y);
-                p1 = p2;
-            }
-            return len;
-        case 'A':
-            // Approximates by breaking curve into line segments
-            len = 0.0;
-            var start = points[4]; // 4 = theta
-            var dTheta = points[5]; // 5 = dTheta
-            var end = points[4] + dTheta;
-            var inc = Math.PI / 180.0; // 1 degree resolution
-            if (Math.abs(start - end) < inc) {
-                inc = Math.abs(start - end);
-            }
-            // Note: for purpose of calculating arc length, not going to worry about rotating X-axis by angle psi
-            
-            p1 = this.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], start, 0);
-            if (dTheta < 0) { // clockwise
-                for (t = start - inc; t > end; t -= inc) {
-                    p2 = this.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], t, 0);
-                    len += this.getLineLength(p1.x, p1.y, p2.x, p2.y);
-                    p1 = p2;
-                }
-            } else { // counter-clockwise
-                for (t = start + inc; t < end; t += inc) {
-                    p2 = this.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], t, 0);
-                    len += this.getLineLength(p1.x, p1.y, p2.x, p2.y);
-                    p1 = p2;
-                }
-            }
-            
-            p2 = this.getPointOnEllipticalArc(points[0], points[1], points[2], points[3], end, 0);
-            len += this.getLineLength(p1.x, p1.y, p2.x, p2.y);
-            
-            return len;
-        }
-        
-        return 0;
-    },
-    getLineLength : function (x1, y1, x2, y2) {
-        
-        return Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
-    },
-    getPointOnLine : function (dist, P1x, P1y, P2x, P2y, fromX, fromY) {
-        
-        if (fromX === undefined) {
-            fromX = P1x;
-        }
-        if (fromY === undefined) {
-            fromY = P1y;
-        }
-        
-        var m = (P2y - P1y) / ((P2x - P1x) + 0.00000001);
-        
-        var run = Math.sqrt(dist * dist / (1 + m * m));
-        var rise = m * run;
-        
-        var pt;
-        
-        if ((fromY - P1y) / ((fromX - P1x) + 0.00000001) === m) {
-            pt = {
-                x : fromX + run,
-                y : fromY + rise
-            };
-        } else {
-            var ix,
-            iy;
-            
-            var len = this.getLineLength(P1x, P1y, P2x, P2y);
-            if (len < 0.00000001) {
-                return undefined;
-            }
-            var u = (((fromX - P1x) * (P2x - P1x)) + ((fromY - P1y) * (P2y - P1y)));
-            u = u / (len * len);
-            
-            ix = P1x + u * (P2x - P1x);
-            iy = P1y + u * (P2y - P1y);
-            
-            var pRise = this.getLineLength(fromX, fromY, ix, iy);
-            var pRun = Math.sqrt(dist * dist - pRise * pRise);
-            
-            run = Math.sqrt(pRun * pRun / (1 + m * m));
-            rise = m * run;
-            
-            pt = {
-                x : ix + run,
-                y : iy + rise
-            };
-        }
-        
-        return pt;
-    },
-    getPointOnCubicBezier : function (pct, P1x, P1y, P2x, P2y, P3x, P3y, P4x, P4y) {
-        function CB1(t) {
-            return t * t * t;
-        }
-        function CB2(t) {
-            return 3 * t * t * (1 - t);
-        }
-        function CB3(t) {
-            return 3 * t * (1 - t) * (1 - t);
-        }
-        function CB4(t) {
-            return (1 - t) * (1 - t) * (1 - t);
-        }
-        
-        var x = P4x * CB1(pct) + P3x * CB2(pct) + P2x * CB3(pct) + P1x * CB4(pct);
-        var y = P4y * CB1(pct) + P3y * CB2(pct) + P2y * CB3(pct) + P1y * CB4(pct);
-        
-        return {
-            x : x,
-            y : y
-        };
-    },
-    getPointOnQuadraticBezier : function (pct, P1x, P1y, P2x, P2y, P3x, P3y) {
-        function QB1(t) {
-            return t * t;
-        }
-        function QB2(t) {
-            return 2 * t * (1 - t);
-        }
-        function QB3(t) {
-            return (1 - t) * (1 - t);
-        }
-        
-        var x = P3x * QB1(pct) + P2x * QB2(pct) + P1x * QB3(pct);
-        var y = P3y * QB1(pct) + P2y * QB2(pct) + P1y * QB3(pct);
-        
-        return {
-            x : x,
-            y : y
-        };
-    },
-    getPointOnEllipticalArc : function (cx, cy, rx, ry, theta, psi) {
-        var cosPsi = Math.cos(psi),
-        sinPsi = Math.sin(psi);
-        var pt = {
-            x : rx * Math.cos(theta),
-            y : ry * Math.sin(theta)
-        };
-        return {
-            x : cx + (pt.x * cosPsi - pt.y * sinPsi),
-            y : cy + (pt.x * sinPsi + pt.y * cosPsi)
-        };
-    },
-    convertEndpointToCenterParameterization : function (x1, y1, x2, y2, fa, fs, rx, ry, psiDeg) {
-        
-        // Derived from: http://www.w3.org/TR/SVG/implnote.html#ArcImplementationNotes
-        
-        var psi = psiDeg * (Math.PI / 180.0);
-        
-        var xp = Math.cos(psi) * (x1 - x2) / 2.0 + Math.sin(psi) * (y1 - y2) / 2.0;
-        var yp = -1 * Math.sin(psi) * (x1 - x2) / 2.0 + Math.cos(psi) * (y1 - y2) / 2.0;
-        
-        var lambda = (xp * xp) / (rx * rx) + (yp * yp) / (ry * ry);
-        
-        if (lambda > 1) {
-            rx *= Math.sqrt(lambda);
-            ry *= Math.sqrt(lambda);
-        }
-        
-        var f = Math.sqrt((((rx * rx) * (ry * ry)) - ((rx * rx) * (yp * yp)) - ((ry * ry) * (xp * xp))) / ((rx * rx) * (yp * yp) + (ry * ry) * (xp * xp)));
-        
-        if (fa == fs)
-            f *= -1;
-        if (isNaN(f))
-            f = 0;
-        
-        var cxp = f * rx * yp / ry;
-        var cyp = f * -ry * xp / rx;
-        
-        var cx = (x1 + x2) / 2.0 + Math.cos(psi) * cxp - Math.sin(psi) * cyp;
-        var cy = (y1 + y2) / 2.0 + Math.sin(psi) * cxp + Math.cos(psi) * cyp;
-        
-        var vMag = function (v) {
-            return Math.sqrt(v[0] * v[0] + v[1] * v[1]);
-        };
-        var vRatio = function (u, v) {
-            return (u[0] * v[0] + u[1] * v[1]) / (vMag(u) * vMag(v));
-        };
-        var vAngle = function (u, v) {
-            return (u[0] * v[1] < u[1] * v[0] ? -1 : 1) * Math.acos(vRatio(u, v));
-        };
-        var theta = vAngle([1, 0], [(xp - cxp) / rx, (yp - cyp) / ry]);
-        
-        var u = [(xp - cxp) / rx, (yp - cyp) / ry];
-        var v = [(-1 * xp - cxp) / rx, (-1 * yp - cyp) / ry];
-        var dTheta = vAngle(u, v);
-        
-        if (vRatio(u, v) <= -1)
-            dTheta = Math.PI;
-        if (vRatio(u, v) >= 1)
-            dTheta = 0;
-        
-        if (fs === 0 && dTheta > 0)
-            dTheta = dTheta - 2 * Math.PI;
-        if (fs == 1 && dTheta < 0)
-            dTheta = dTheta + 2 * Math.PI;
-        
-        return [cx, cy, rx, ry, theta, dTheta, psi, fs];
-    }
-    
-};
diff --git a/src/shapes/Ellipse.js b/src/shapes/Ellipse.js
index 93c7b285..46e93702 100644
--- a/src/shapes/Ellipse.js
+++ b/src/shapes/Ellipse.js
@@ -21,9 +21,7 @@ Kinetic.Ellipse = Kinetic.Shape.extend({
 
         // call super constructor
         this._super(config);
-
         this._convertRadius();
-
         var that = this;
         this.on('radiusChange.kinetic', function() {
             that._convertRadius();
diff --git a/src/shapes/Sprite.js b/src/shapes/Sprite.js
index 9d2494da..cc3c8f15 100644
--- a/src/shapes/Sprite.js
+++ b/src/shapes/Sprite.js
@@ -17,7 +17,6 @@ Kinetic.Sprite = Kinetic.Shape.extend({
         config.drawFunc = this.drawFunc;
         // call super constructor
         this._super(config);
-
         var that = this;
         this.on('animationChange.kinetic', function() {
             // reset index when animation changes
diff --git a/src/shapes/Text.js b/src/shapes/Text.js
index b6f7a723..5bd4ba52 100644
--- a/src/shapes/Text.js
+++ b/src/shapes/Text.js
@@ -38,7 +38,6 @@ Kinetic.Text = Kinetic.Shape.extend({
             var attr = attrs[n];
             this.on(attr + 'Change.kinetic', that._setTextData);
         }
-
         that._setTextData();
     },
     drawFunc: function(context) {
diff --git a/src/util/Geometry.js b/src/util/Geometry.js
new file mode 100644
index 00000000..40bd2a5d
--- /dev/null
+++ b/src/util/Geometry.js
@@ -0,0 +1,102 @@
+/*
+ * Utility methods written by jfollas to
+ * handle length and point measurements
+ */
+Kinetic.Geometry = {
+    getLineLength: function(x1, y1, x2, y2) {
+        return Math.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1));
+    },
+    getPointOnLine: function(dist, P1x, P1y, P2x, P2y, fromX, fromY) {
+        if(fromX === undefined) {
+            fromX = P1x;
+        }
+        if(fromY === undefined) {
+            fromY = P1y;
+        }
+
+        var m = (P2y - P1y) / ((P2x - P1x) + 0.00000001);
+        var run = Math.sqrt(dist * dist / (1 + m * m));
+        var rise = m * run;
+        var pt;
+
+        if((fromY - P1y) / ((fromX - P1x) + 0.00000001) === m) {
+            pt = {
+                x: fromX + run,
+                y: fromY + rise
+            };
+        }
+        else {
+            var ix, iy;
+
+            var len = this.getLineLength(P1x, P1y, P2x, P2y);
+            if(len < 0.00000001) {
+                return undefined;
+            }
+            var u = (((fromX - P1x) * (P2x - P1x)) + ((fromY - P1y) * (P2y - P1y)));
+            u = u / (len * len);
+            ix = P1x + u * (P2x - P1x);
+            iy = P1y + u * (P2y - P1y);
+
+            var pRise = this.getLineLength(fromX, fromY, ix, iy);
+            var pRun = Math.sqrt(dist * dist - pRise * pRise);
+            run = Math.sqrt(pRun * pRun / (1 + m * m));
+            rise = m * run;
+            pt = {
+                x: ix + run,
+                y: iy + rise
+            };
+        }
+
+        return pt;
+    },
+    getPointOnCubicBezier: function(pct, P1x, P1y, P2x, P2y, P3x, P3y, P4x, P4y) {
+        function CB1(t) {
+            return t * t * t;
+        }
+        function CB2(t) {
+            return 3 * t * t * (1 - t);
+        }
+        function CB3(t) {
+            return 3 * t * (1 - t) * (1 - t);
+        }
+        function CB4(t) {
+            return (1 - t) * (1 - t) * (1 - t);
+        }
+        var x = P4x * CB1(pct) + P3x * CB2(pct) + P2x * CB3(pct) + P1x * CB4(pct);
+        var y = P4y * CB1(pct) + P3y * CB2(pct) + P2y * CB3(pct) + P1y * CB4(pct);
+
+        return {
+            x: x,
+            y: y
+        };
+    },
+    getPointOnQuadraticBezier: function(pct, P1x, P1y, P2x, P2y, P3x, P3y) {
+        function QB1(t) {
+            return t * t;
+        }
+        function QB2(t) {
+            return 2 * t * (1 - t);
+        }
+        function QB3(t) {
+            return (1 - t) * (1 - t);
+        }
+        var x = P3x * QB1(pct) + P2x * QB2(pct) + P1x * QB3(pct);
+        var y = P3y * QB1(pct) + P2y * QB2(pct) + P1y * QB3(pct);
+
+        return {
+            x: x,
+            y: y
+        };
+    },
+    getPointOnEllipticalArc: function(cx, cy, rx, ry, theta, psi) {
+        var cosPsi = Math.cos(psi), sinPsi = Math.sin(psi);
+        var pt = {
+            x: rx * Math.cos(theta),
+            y: ry * Math.sin(theta)
+        };
+        return {
+            x: cx + (pt.x * cosPsi - pt.y * sinPsi),
+            y: cy + (pt.x * sinPsi + pt.y * cosPsi)
+        };
+    }
+};
diff --git a/tests/html/performanceTests.html b/tests/html/performanceTests.html
index 97e2c403..233560fd 100644
--- a/tests/html/performanceTests.html
+++ b/tests/html/performanceTests.html
@@ -11,6 +11,7 @@
         <!-- assets -->
 		<script src="../js/Test.js"></script>
 		<script src="../js/performanceTests.js"></script>
+		<script src="../assets/worldMap.js"></script>
 		<script>
             window.onload = function() {
                 var test = new Test();
diff --git a/tests/js/performanceTests.js b/tests/js/performanceTests.js
index 2079941d..98c5b421 100644
--- a/tests/js/performanceTests.js
+++ b/tests/js/performanceTests.js
@@ -22,8 +22,8 @@ Test.prototype.tests = {
             layer.add(rect);
         }
         stage.add(layer);
-		
-		console.profileEnd();
+
+        console.profileEnd();
         endTimer('add and draw 1,000 Kinetic rectangles');
 
     },
@@ -59,9 +59,9 @@ Test.prototype.tests = {
         });
 
         stage.start();
-        
+
         setTimeout(function() {
-        	//stage.stop();
+            //stage.stop();
         }, 1000)
     },
     'DRAWING - draw rect vs image from image data': function(containerId) {
@@ -219,5 +219,53 @@ Test.prototype.tests = {
                 endTimer('draw 1,000 cached stars');
             }
         });
+    },
+    '*PATH - add map path': function(containerId) {
+        startTimer();
+        var stage = new Kinetic.Stage({
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
+        var mapLayer = new Kinetic.Layer();
+
+        for(var key in worldMap.shapes) {
+            var c = worldMap.shapes[key];
+
+            var path = new Kinetic.Plugins.Path({
+                data: c,
+                fill: '#ccc',
+                stroke: '#999',
+                strokeWidth: 1
+            });
+
+            if(key === 'US')
+                test(path.dataArray[0].command === 'M', 'first command should be a moveTo');
+
+            path.on('mouseover', function() {
+                this.setFill('red');
+                mapLayer.draw();
+            });
+
+            path.on('mouseout', function() {
+                this.setFill('#ccc');
+                mapLayer.draw();
+            });
+
+            mapLayer.add(path);
+        }
+
+        stage.add(mapLayer);
+
+        endTimer('time build and to draw map');
+        
+        mapLayer.beforeDraw(startTimer);
+        mapLayer.afterDraw(function() {
+        	endTimer('redraw layer');
+        });
     }
 };
diff --git a/tests/js/unitTests.js b/tests/js/unitTests.js
index e02cf0b7..9b3798c0 100644
--- a/tests/js/unitTests.js
+++ b/tests/js/unitTests.js
@@ -2,68 +2,68 @@ Test.prototype.tests = {
     ////////////////////////////////////////////////////////////////////////
     //  STAGE tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'STAGE - instantiate stage with id' : function (containerId) {
+
+    'STAGE - instantiate stage with id': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
     },
-    'STAGE - instantiate stage with dom element' : function (containerId) {
+    'STAGE - instantiate stage with dom element': function(containerId) {
         var containerDom = document.getElementById(containerId);
         var stage = new Kinetic.Stage({
-                container : containerDom,
-                width : 578,
-                height : 200
-            });
+            container: containerDom,
+            width: 578,
+            height: 200
+        });
     },
-    'STAGE - set stage size' : function (containerId) {
+    'STAGE - set stage size': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         test(stage.getSize().width === 578 && stage.getSize().height === 200, 'stage size should be 578 x 200');
         stage.setSize(1, 2);
         test(stage.getSize().width === 1 && stage.getSize().height === 2, 'stage size should be 1 x 2');
         stage.setSize(3);
         test(stage.getSize().width === 3 && stage.getSize().height === 3, 'stage size should be 3 x 3');
         stage.setSize({
-            width : 4,
-            height : 5
+            width: 4,
+            height: 5
         });
         test(stage.getSize().width === 4 && stage.getSize().height === 5, 'stage size should be 4 x 5');
         stage.setSize({
-            width : 6
+            width: 6
         });
         test(stage.getSize().width === 6 && stage.getSize().height === 5, 'stage size should be 6 x 5');
         stage.setSize({
-            height : 7
+            height: 7
         });
         test(stage.getSize().width === 6 && stage.getSize().height === 7, 'stage size should be 6 x 7');
         stage.setSize([8, 9]);
         test(stage.getSize().width === 8 && stage.getSize().height === 9, 'stage size should be 8 x 9');
         stage.setSize([1, 1, 10, 11]);
         test(stage.getSize().width === 10 && stage.getSize().height === 11, 'stage size should be 10 x 11');
-        
+
         layer.add(circle);
         stage.add(layer);
-        
+
         stage.setSize(333, 155);
-        
+
         test(stage.getSize().width === 333, 'stage width should be 333');
         test(stage.getSize().height === 155, 'stage height should be 155');
         test(stage.getDOM().style.width === '333px', 'content width should be 333');
@@ -71,167 +71,167 @@ Test.prototype.tests = {
         test(layer.getCanvas().element.width === 333, 'layer canvas element width should be 333');
         test(layer.getCanvas().element.height === 155, 'layer canvas element width should be 155');
     },
-    'STAGE - add shape then stage then layer' : function (containerId) {
+    'STAGE - add shape then stage then layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         group.add(circle);
         stage.add(layer);
         layer.add(group);
         layer.draw();
     },
-    'STAGE - test layer throttle' : function (containerId) {
+    'STAGE - test layer throttle': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
+
         test(layer.lastDrawTime === 0, 'layer last draw time should be 0');
-        
+
         /*
          * if throttling isn't working correctly, then the circle will
          * flash green and then turn red
          */
         circle.setFill('red');
         layer.draw();
-        
+
         test(layer.lastDrawTime > 0, 'layer last draw time should be greather than 0');
-        
+
     },
-    'STAGE - add shape with linear gradient fill' : function (containerId) {
+    'STAGE - add shape with linear gradient fill': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : {
-                    start : {
-                        x : -35,
-                        y : -35
-                    },
-                    end : {
-                        x : 35,
-                        y : 35
-                    },
-                    colorStops : [0, 'red', 1, 'blue']
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: {
+                start: {
+                    x: -35,
+                    y: -35
                 },
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle',
-                draggable : true
-            });
-        
+                end: {
+                    x: 35,
+                    y: 35
+                },
+                colorStops: [0, 'red', 1, 'blue']
+            },
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle',
+            draggable: true
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
+
         test(circle.getName() === 'myCircle', 'circle name should be myCircle');
     },
-    'STAGE - add shape with alpha' : function (containerId) {
+    'STAGE - add shape with alpha': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer({
-                throttle : 9999
-            });
+            throttle: 9999
+        });
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'red'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'red'
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
+
         circle.setAlpha(0.5);
         layer.draw();
-        
+
         circle.setAlpha(0.5);
         layer.draw();
     },
-    'STAGE - add layer then group then shape' : function (containerId) {
+    'STAGE - add layer then group then shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         stage.add(layer);
         layer.add(group);
         group.add(circle);
         layer.draw();
     },
-    'STAGE - serialize stage' : function (containerId) {
+    'STAGE - serialize stage': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle',
-                draggable : true
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle',
+            draggable: true
+        });
+
         stage.add(layer);
         layer.add(group);
         group.add(circle);
@@ -242,63 +242,63 @@ Test.prototype.tests = {
         //console.log(stage.toJSON())
         test(stage.toJSON() === expectedJson, 'problem with serialization');
     },
-    'STAGE - reset stage' : function (containerId) {
+    'STAGE - reset stage': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                x : 100
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            x: 100
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle',
-                draggable : true
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle',
+            draggable: true
+        });
+
         stage.add(layer);
         layer.add(group);
         group.add(circle);
         layer.draw();
-        
+
         test(stage.getChildren().length === 1, 'stage should have one child');
         test(stage.getX() === 100, 'stage x should be 100');
         stage.reset();
         test(stage.getChildren().length === 0, 'stage should have no children');
         test(stage.getX() === 0, 'stage x should be 0');
     },
-    'STAGE - test getAttrs()' : function (containerId) {
+    'STAGE - test getAttrs()': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : 100,
-                y : 100,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle',
-                draggable : true
-            });
-        
+            x: 100,
+            y: 100,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle',
+            draggable: true
+        });
+
         stage.add(layer);
         layer.add(group);
         group.add(circle);
         layer.draw();
-        
+
         var attrs = circle.getAttrs();
-        
+
         test(attrs.x === 100, 'x attr should be 100');
         test(attrs.y === 100, 'y attr should be 100');
         test(attrs.radius.x === 70, 'radius attr should be 70');
@@ -308,16 +308,16 @@ Test.prototype.tests = {
         test(attrs.name === 'myCircle', 'name attr should be myCircle');
         test(attrs.draggable === true, 'draggable attr should be true');
     },
-    'STAGE - get stage DOM' : function (containerId) {
+    'STAGE - get stage DOM': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         test(stage.getDOM().className === 'kineticjs-content', 'stage DOM class name is wrong');
     },
-    'STAGE - load stage using json' : function (containerId) {
+    'STAGE - load stage using json': function(containerId) {
         var stage = new Kinetic.Stage({
             container: containerId,
             width: 578,
@@ -329,18 +329,18 @@ Test.prototype.tests = {
 
         test(stage.toJSON() === json, "problem loading stage with json");
     },
-    'STAGE - serialize stage with custom shape' : function (containerId) {
+    'STAGE - serialize stage with custom shape': function(containerId) {
         var urls = dataUrls['STAGE - serialize stage with custom shape'];
-        
+
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
-        var drawTriangle = function (context) {
+
+        var drawTriangle = function(context) {
             context.beginPath();
             context.moveTo(200, 50);
             context.lineTo(420, 80);
@@ -350,46 +350,46 @@ Test.prototype.tests = {
             this.stroke(context);
         };
         var triangle = new Kinetic.Shape({
-                drawFunc : drawTriangle,
-                fill : "#00D2FF",
-                stroke : "black",
-                strokeWidth : 4,
-                id : 'myTriangle'
-            });
-        
+            drawFunc: drawTriangle,
+            fill: "#00D2FF",
+            stroke: "black",
+            strokeWidth: 4,
+            id: 'myTriangle'
+        });
+
         group.add(triangle);
         layer.add(group);
         stage.add(layer);
-        
+
         var startDataUrl = layer.toDataURL();
-        
+
         warn(startDataUrl === urls[0], 'start data url is incorrect');
         test(triangle.getId() === 'myTriangle', 'triangle id should be myTriangle');
-        
+
         //console.log(stage.toJSON())
         var expectedJson = '{"attrs":{"width":578,"height":200,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Stage","children":[{"attrs":{"clearBeforeDraw":true,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Layer","children":[{"attrs":{"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Group","children":[{"attrs":{"detectionType":"path","visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80,"fill":"#00D2FF","stroke":"black","strokeWidth":4,"id":"myTriangle"},"nodeType":"Shape"}]}]}]}';
-        
+
         //console.log(stage.toJSON())
         test(stage.toJSON() === expectedJson, "problem serializing stage with custom shape");
-        
+
         /*
          * test redrawing layer after serialization
          * drawing should be the same
          */
         layer.draw();
-        
+
         var endDataUrl = layer.toDataURL();
         warn(endDataUrl === urls[0], 'end data url is incorrect');
-        
+
     },
-    'STAGE - load stage with custom shape using json' : function (containerId) {
+    'STAGE - load stage with custom shape using json': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
-        var drawTriangle = function (context) {
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
+        var drawTriangle = function(context) {
             context.beginPath();
             context.moveTo(200, 50);
             context.lineTo(420, 80);
@@ -400,191 +400,191 @@ Test.prototype.tests = {
         };
         var json = '{"attrs":{"width":578,"height":200,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Stage","children":[{"attrs":{"clearBeforeDraw":true,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Layer","children":[{"attrs":{"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Group","children":[{"attrs":{"detectionType":"path","visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80,"fill":"#00D2FF","stroke":"black","strokeWidth":4,"id":"myTriangle"},"nodeType":"Shape"}]}]}]}';
         stage.load(json);
-        
+
         var customShape = stage.get('#myTriangle')[0];
-        
+
         customShape.setDrawFunc(drawTriangle);
-        
+
         stage.draw();
         //console.log(stage.toJSON());
         test(stage.toJSON() === json, "problem loading stage with custom shape json");
     },
-    'EVENTS - test getIntersections' : function (containerId) {
+    'EVENTS - test getIntersections': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                throttle : 999
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            throttle: 999
+        });
         var layer = new Kinetic.Layer();
-        
+
         var group = new Kinetic.Group();
-        
+
         var redCircle = new Kinetic.Ellipse({
-                x : 380,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                strokeWidth : 4,
-                fill : 'red',
-                stroke : 'black',
-                id : 'redCircle'
-            });
-        
+            x: 380,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            strokeWidth: 4,
+            fill: 'red',
+            stroke: 'black',
+            id: 'redCircle'
+        });
+
         var greenCircle = new Kinetic.Ellipse({
-                x : 300,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                strokeWidth : 4,
-                fill : 'green',
-                stroke : 'black',
-                id : 'greenCircle'
-            });
-        
+            x: 300,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            strokeWidth: 4,
+            fill: 'green',
+            stroke: 'black',
+            id: 'greenCircle'
+        });
+
         group.add(redCircle);
         layer.add(group);
         layer.add(greenCircle);
         stage.add(layer);
-        
+
         test(stage.getIntersections(350, 118).length === 2, 'getIntersections should return two shapes');
         test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
         test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', 'second intersection should be greenCircle');
-        
+
         // hide green circle.  make sure only red circle is in result set
         greenCircle.hide();
         layer.draw();
-        
+
         test(stage.getIntersections(350, 118).length === 1, 'getIntersections should return one shape');
         test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
-        
+
         // show green circle again.  make sure both circles are in result set
         greenCircle.show();
         layer.draw();
-        
+
         test(stage.getIntersections(350, 118).length === 2, 'getIntersections should return two shapes');
         test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
         test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', 'second intersection should be greenCircle');
-        
+
         // hide red circle.  make sure only green circle is in result set
         redCircle.hide();
         layer.draw();
-        
+
         test(stage.getIntersections(350, 118).length === 1, 'getIntersections should return one shape');
         test(stage.getIntersections(350, 118)[0].getId() === 'greenCircle', 'first intersection should be greenCircle');
-        
+
         // show red circle again.  make sure both circles are in result set
         redCircle.show();
         layer.draw();
-        
+
         test(stage.getIntersections(350, 118).length === 2, 'getIntersections should return two shapes');
         test(stage.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
         test(stage.getIntersections(350, 118)[1].getId() === 'greenCircle', 'second intersection should be greenCircle');
-        
+
         // test from layer
         test(layer.getIntersections(350, 118).length === 2, 'getIntersections should return two shapes');
         test(layer.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
         test(layer.getIntersections(350, 118)[1].getId() === 'greenCircle', 'second intersection should be greenCircle');
-        
+
         // test from group
         test(group.getIntersections(350, 118).length === 1, 'getIntersections should return two shapes');
         test(group.getIntersections(350, 118)[0].getId() === 'redCircle', 'first intersection should be redCircle');
     },
-    'STAGE - scale stage after add layer' : function (containerId) {
+    'STAGE - scale stage after add layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         stage.setScale(0.5);
-        
+
         test(stage.getScale().x === 0.5, 'stage scale x should be 0.5');
         test(stage.getScale().y === 0.5, 'stage scale y should be 0.5');
-        
+
         stage.draw();
     },
-    'STAGE - scale stage before add shape' : function (containerId) {
+    'STAGE - scale stage before add shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         stage.setScale(0.5);
-        
+
         test(stage.getScale().x === 0.5, 'stage scale x should be 0.5');
         test(stage.getScale().y === 0.5, 'stage scale y should be 0.5');
-        
+
         layer.add(circle);
         stage.add(layer);
     },
-    'STAGE - scale stage with no shapes' : function (containerId) {
+    'STAGE - scale stage with no shapes': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         stage.add(layer);
         stage.setScale(0.5);
-        
+
         stage.draw();
     },
-    'STAGE - select shape by id and name' : function (containerId) {
+    'STAGE - select shape by id and name': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer({
-                id : 'myLayer'
-            });
+            id: 'myLayer'
+        });
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                id : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            id: 'myCircle'
+        });
+
         var rect = new Kinetic.Rect({
-                x : 300,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'purple',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myRect'
-            });
-        
+            x: 300,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'purple',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myRect'
+        });
+
         layer.add(circle);
         layer.add(rect);
         stage.add(layer);
-        
+
         var node;
         node = stage.get('#myCircle')[0];
         test(node.shapeType === 'Ellipse', 'shape type should be Ellipse');
@@ -594,302 +594,302 @@ Test.prototype.tests = {
         test(node === undefined, 'node should be undefined');
         node = stage.get('#myLayer')[0];
         test(node.nodeType === 'Layer', 'node type should be Layer');
-        
+
     },
-    'STAGE - remove shape by id or name' : function (containerId) {
+    'STAGE - remove shape by id or name': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                id : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            id: 'myCircle'
+        });
+
         var rect = new Kinetic.Rect({
-                x : 300,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'purple',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myRect'
-            });
-        
+            x: 300,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'purple',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myRect'
+        });
+
         layer.add(circle);
         layer.add(rect);
         stage.add(layer);
-        
+
         var node = stage.get('#myCircle')[0];
         var nodes = stage.get('.myRect');
-        
+
         test(stage.ids.myCircle._id === circle._id, 'circle not in ids hash');
         test(stage.names.myRect[0]._id === rect._id, 'rect not in names hash');
-        
+
         var node = stage.get('#myCircle')[0];
         var parent = node.getParent();
-        
+
         parent.remove(node);
-        
+
         test(stage.ids.myCircle === undefined, 'circle still in hash');
         test(stage.names.myRect[0]._id === rect._id, 'rect not in names hash');
-        
+
         var parent = nodes[0].getParent();
         parent.remove(nodes[0]);
-        
+
         test(stage.ids.myCircle === undefined, 'circle still in hash');
         test(stage.names.myRect === undefined, 'rect still in hash');
     },
-    'STAGE - test ids and names hashes' : function (containerId) {
+    'STAGE - test ids and names hashes': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                id : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            id: 'myCircle'
+        });
+
         var rect = new Kinetic.Rect({
-                x : 300,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'purple',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myRect'
-            });
-        
+            x: 300,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'purple',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myRect'
+        });
+
         layer.add(circle);
         layer.add(rect);
         stage.add(layer);
-        
+
         test(stage.ids['myCircle'].getId() === 'myCircle', 'circle id not in ids hash');
         test(stage.names['myRect'][0].getName() === 'myRect', 'rect name not in names hash');
-        
+
         circle.setId('newCircleId');
         test(stage.ids['newCircleId'].getId() === 'newCircleId', 'circle not in ids hash');
         test(stage.ids['myCircle'] === undefined, 'old circle id key is still in ids hash');
-        
+
         rect.setName('newRectName');
         test(stage.names['newRectName'][0].getName() === 'newRectName', 'new rect name not in names hash');
         test(stage.names['myRect'] === undefined, 'old rect name is still in names hash');
     },
-    'STAGE - set shape and layer alpha to 0.5' : function (containerId) {
+    'STAGE - set shape and layer alpha to 0.5': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         circle.setAlpha(0.5);
         layer.setAlpha(0.5);
         layer.add(circle);
         stage.add(layer);
-        
+
         test(circle.getAbsoluteAlpha() === 0.25, 'abs alpha should be 0.25');
         test(layer.getAbsoluteAlpha() === 0.5, 'abs alpha should be 0.5');
     },
-    'STAGE - remove shape without adding its parent to stage' : function (containerId) {
+    'STAGE - remove shape without adding its parent to stage': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                id : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            id: 'myCircle'
+        });
+
         var go = Kinetic.Global;
-        
+
         test(go.tempNodes.length === 0, 'shouldn\'t be nodes in the tempNdoes array');
-        
+
         layer.add(circle);
-        
+
         var node = stage.get('#myCircle')[0];
-        
+
         test(node === undefined, 'node should be undefined');
-        
+
         test(go.tempNodes.length === 1, 'tempNodes array should have one node');
-        
+
         layer.remove(circle);
-        
+
         test(go.tempNodes.length === 0, 'shouldn\'t be nodes in the tempNdoes array');
-        
+
     },
-    'STAGE - remove layer with shape' : function (containerId) {
+    'STAGE - remove layer with shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer({
-                name : 'myLayer'
-            });
+            name: 'myLayer'
+        });
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         test(stage.children.length === 1, 'stage should have 1 children');
         test(stage.get('.myLayer')[0] !== undefined, 'layer should exist');
         test(stage.get('.myCircle')[0] !== undefined, 'circle should exist');
-        
+
         stage.remove(layer);
-        
+
         test(stage.children.length === 0, 'stage should have 0 children');
         test(stage.get('.myLayer')[0] === undefined, 'layer should not exist');
         test(stage.get('.myCircle')[0] === undefined, 'circle should not exist');
     },
-    'STAGE - remove layer with no shapes' : function (containerId) {
+    'STAGE - remove layer with no shapes': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         stage.add(layer);
         stage.remove(layer);
-        
+
         test(stage.children.length === 0, 'stage should have 0 children');
     },
-    'STAGE - remove shape multiple times' : function (containerId) {
+    'STAGE - remove shape multiple times': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var shape1 = new Kinetic.Ellipse({
-                x : 150,
-                y : 100,
-                radius : 50,
-                fill : 'green',
-                name : 'myCircle'
-            });
-        
+            x: 150,
+            y: 100,
+            radius: 50,
+            fill: 'green',
+            name: 'myCircle'
+        });
+
         var shape2 = new Kinetic.Ellipse({
-                x : 250,
-                y : 100,
-                radius : 50,
-                fill : 'green',
-                name : 'myCircle'
-            });
-        
+            x: 250,
+            y: 100,
+            radius: 50,
+            fill: 'green',
+            name: 'myCircle'
+        });
+
         layer.add(shape1);
         layer.add(shape2);
         stage.add(layer);
-        
+
         test(layer.getChildren().length === 2, 'layer should have two children');
-        
+
         layer.remove(shape1);
         layer.remove(shape1);
-        
+
         test(layer.getChildren().length === 1, 'layer should have two children');
-        
+
         layer.draw();
-        
+
     },
-    'STAGE - remove layer multiple times' : function (containerId) {
+    'STAGE - remove layer multiple times': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer1 = new Kinetic.Layer();
         var layer2 = new Kinetic.Layer();
-        
+
         var shape1 = new Kinetic.Ellipse({
-                x : 150,
-                y : 100,
-                radius : 50,
-                fill : 'green',
-                name : 'myCircle'
-            });
-        
+            x: 150,
+            y: 100,
+            radius: 50,
+            fill: 'green',
+            name: 'myCircle'
+        });
+
         var shape2 = new Kinetic.Ellipse({
-                x : 250,
-                y : 100,
-                radius : 50,
-                fill : 'green',
-                name : 'myCircle'
-            });
-        
+            x: 250,
+            y: 100,
+            radius: 50,
+            fill: 'green',
+            name: 'myCircle'
+        });
+
         layer1.add(shape1);
         layer2.add(shape2);
         stage.add(layer1);
         stage.add(layer2);
-        
+
         test(stage.getChildren().length === 2, 'stage should have two children');
-        
+
         stage.remove(layer1);
         stage.remove(layer1);
-        
+
         test(stage.getChildren().length === 1, 'stage should have one child');
-        
+
         stage.draw();
-        
+
     },
-    'STAGE - serialize stage with an image' : function (containerId) {
+    'STAGE - serialize stage with an image': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer();
             darth = new Kinetic.Image({
-                    x : 200,
-                    y : 60,
-                    image : imageObj,
-                    offset : {
-                        x : 50,
-                        y : imageObj.height / 2
-                    },
-                    id : 'darth'
-                });
-            
+                x: 200,
+                y: 60,
+                image: imageObj,
+                offset: {
+                    x: 50,
+                    y: imageObj.height / 2
+                },
+                id: 'darth'
+            });
+
             layer.add(darth);
             stage.add(layer);
             var expectedJson = '{"attrs":{"width":578,"height":200,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Stage","children":[{"attrs":{"clearBeforeDraw":true,"visible":true,"listening":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80},"nodeType":"Layer","children":[{"attrs":{"detectionType":"path","visible":true,"listening":true,"alpha":1,"x":200,"y":60,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":50,"y":150},"dragConstraint":"none","dragBounds":{},"draggable":false,"dragThrottle":80,"id":"darth"},"nodeType":"Shape","shapeType":"Image"}]}]}';
@@ -898,15 +898,15 @@ Test.prototype.tests = {
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'STAGE - load stage with an image' : function (containerId) {
+    'STAGE - load stage with an image': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
-            
+                container: containerId,
+                width: 578,
+                height: 200
+            });
+
             var json = '{"attrs":{"width":578,"height":200,"visible":true,"listen":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Stage","children":[{"attrs":{"visible":true,"listen":true,"alpha":1,"x":0,"y":0,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":0,"y":0},"dragConstraint":"none","dragBounds":{},"draggable":false},"nodeType":"Layer","children":[{"attrs":{"crop":{"x":0,"y":0},"detectionType":"path","visible":true,"listen":true,"alpha":1,"x":200,"y":60,"scale":{"x":1,"y":1},"rotation":0,"offset":{"x":50,"y":150},"dragConstraint":"none","dragBounds":{},"draggable":false,"id":"darth"},"nodeType":"Shape","shapeType":"Image"}]}]}';
             stage.load(json);
             var image = stage.get('#darth')[0];
@@ -918,133 +918,133 @@ Test.prototype.tests = {
     ////////////////////////////////////////////////////////////////////////
     //  LAYERS tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'LAYER - add layer' : function (containerId) {
+
+    'LAYER - add layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         stage.add(layer);
     },
-    'LAYER - hide layer' : function (containerId) {
+    'LAYER - hide layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         var layer1 = new Kinetic.Layer();
         var layer2 = new Kinetic.Layer();
-        
+
         var circle1 = new Kinetic.Ellipse({
-                x : 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         var circle2 = new Kinetic.Ellipse({
-                x : 150,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
-        circle1.on('mousemove', function () {
+            x: 150,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
+        circle1.on('mousemove', function() {
             console.log('mousemove circle1');
         });
-        
-        circle2.on('mousemove', function () {
+
+        circle2.on('mousemove', function() {
             console.log('mousemove circle2');
         });
-        
+
         layer1.add(circle1);
         layer2.add(circle2);
         stage.add(layer1).add(layer2);
-        
+
         test(layer2.isVisible(), 'layer2 should be visible');
-        
+
         layer2.hide();
         layer2.draw();
-        
+
         test(!layer2.isVisible(), 'layer2 should be invisible');
     },
-    'LAYER - beforeDraw and afterDraw' : function (containerId) {
+    'LAYER - beforeDraw and afterDraw': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         var layer = new Kinetic.Layer();
-        
+
         var circle = new Kinetic.Ellipse({
-                x : 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         var counter = 0;
-        
-        layer.beforeDraw(function () {
+
+        layer.beforeDraw(function() {
             counter++;
             test(counter === 1, 'counter should be 1');
         });
-        
-        layer.afterDraw(function () {
+
+        layer.afterDraw(function() {
             counter++;
             test(counter === 2, 'counter should be 2');
         });
-        
+
         layer.draw();
     },
-    'LAYER - set clearBeforeDraw to false, and test toDataURL for stage, layer, group, and shape' : function (containerId) {
+    'LAYER - set clearBeforeDraw to false, and test toDataURL for stage, layer, group, and shape': function(containerId) {
         var urls = dataUrls['LAYER - set clearBeforeDraw to false'];
-        
+
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         var layer = new Kinetic.Layer({
-                clearBeforeDraw : false,
-                throttle : 999
-            });
-        
+            clearBeforeDraw: false,
+            throttle: 999
+        });
+
         var group = new Kinetic.Group();
-        
+
         var circle = new Kinetic.Ellipse({
-                x : 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
-        for (var n = 0; n < 20; n++) {
+
+        for(var n = 0; n < 20; n++) {
             circle.move(10, 0);
             layer.draw();
         }
-        
+
         stage.toDataURL({
-            callback : function (dataUrl) {
+            callback: function(dataUrl) {
                 warn(urls[0] === dataUrl, 'stage data url is incorrect');
             }
         });
@@ -1054,170 +1054,170 @@ Test.prototype.tests = {
     },
     'LAYER - add layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         stage.add(layer);
     },
-    'LAYER - remove all children from layer' : function (containerId) {
+    'LAYER - remove all children from layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle1 = new Kinetic.Ellipse({
-                x : 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var circle2 = new Kinetic.Ellipse({
-                x : 300,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 300,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(circle1);
         layer.add(circle2);
         stage.add(layer);
-        
+
         test(layer.children.length === 2, 'layer should have 2 children');
-        
+
         layer.removeChildren();
         layer.draw();
-        
+
         test(layer.children.length === 0, 'layer should have 0 children');
     },
     ////////////////////////////////////////////////////////////////////////
     //  GROUPS tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'GROUP - add group' : function (containerId) {
+
+    'GROUP - add group': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
+
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
     },
-    'GROUP - hide group' : function (containerId) {
+    'GROUP - hide group': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
+
         var circle1 = new Kinetic.Ellipse({
-                x : 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         var circle2 = new Kinetic.Ellipse({
-                x : 150,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
-        circle1.on('mousemove', function () {
+            x: 150,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
+        circle1.on('mousemove', function() {
             console.log('mousemove circle1');
         });
-        
-        circle2.on('mousemove', function () {
+
+        circle2.on('mousemove', function() {
             console.log('mousemove circle2');
         });
-        
+
         group.add(circle2);
         layer.add(circle1).add(group);
         stage.add(layer);
-        
+
         test(group.isVisible(), 'group should be visible');
         test(circle2.isVisible(), 'circle2 should be visible');
-        
+
         group.hide();
         layer.draw();
-        
+
         test(!group.isVisible(), 'group should be invisible');
         test(!circle2.isVisible(), 'circle2 should be invisible');
     },
-    'GROUP - create two groups, move first group' : function (containerId) {
+    'GROUP - create two groups, move first group': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var greenLayer = new Kinetic.Layer();
         var blueLayer = new Kinetic.Layer();
         var greenGroup = new Kinetic.Group();
         var blueGroup = new Kinetic.Group();
-        
+
         var greencircle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2 - 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                draggable : true
-            });
-        
+            x: stage.getWidth() / 2 - 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            draggable: true
+        });
+
         var bluecircle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2 + 100,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2 + 100,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         greenGroup.add(greencircle);
         blueGroup.add(bluecircle);
         greenLayer.add(greenGroup);
         blueLayer.add(blueGroup);
         stage.add(greenLayer);
         stage.add(blueLayer);
-        
+
         blueLayer.removeChildren();
         var blueGroup2 = new Kinetic.Group();
         var bluecircle2 = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         blueGroup2.add(bluecircle2);
         blueLayer.add(blueGroup2);
         blueLayer.draw();
@@ -1227,247 +1227,246 @@ Test.prototype.tests = {
     ////////////////////////////////////////////////////////////////////////
     //  SHAPES tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'SHAPE - add shape with pattern fill' : function (containerId) {
+
+    'SHAPE - add shape with pattern fill': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer();
             var group = new Kinetic.Group();
             var circle = new Kinetic.Ellipse({
-                    x : stage.getWidth() / 2,
-                    y : stage.getHeight() / 2,
-                    radius : 70,
-                    fill : {
-                        image : imageObj,
-                        repeat : 'no-repeat',
-                        offset : [-200, -70],
-                        scale : 0.7
-                    },
-                    stroke : 'black',
-                    strokeWidth : 4,
-                    name : 'myCircle',
-                    draggable : true
-                });
-            
+                x: stage.getWidth() / 2,
+                y: stage.getHeight() / 2,
+                radius: 70,
+                fill: {
+                    image: imageObj,
+                    repeat: 'no-repeat',
+                    offset: [-200, -70],
+                    scale: 0.7
+                },
+                stroke: 'black',
+                strokeWidth: 4,
+                name: 'myCircle',
+                draggable: true
+            });
+
             group.add(circle);
             layer.add(group);
             stage.add(layer);
-            
+
             test(circle.getFill().repeat === 'no-repeat', 'repeat option should be no-repeat');
             test(circle.getFill().offset.x === -200, 'fill offset x should be -200');
             test(circle.getFill().offset.y === -70, 'fill offset y should be -70');
-            
+
             /*
              * test offset setting
              */
             circle.setFill({
-                offset : [1, 2]
+                offset: [1, 2]
             });
             test(circle.getFill().offset.x === 1, 'fill offset x should be 1');
             test(circle.getFill().offset.y === 2, 'fill offset y should be 2');
-            
+
             circle.setFill({
-                offset : {
-                    x : 3,
-                    y : 4
+                offset: {
+                    x: 3,
+                    y: 4
                 }
             });
             test(circle.getFill().offset.x === 3, 'fill offset x should be 3');
             test(circle.getFill().offset.y === 4, 'fill offset y should be 4');
-            
+
             circle.setFill({
-                offset : {
-                    x : 5
+                offset: {
+                    x: 5
                 }
             });
             test(circle.getFill().offset.x === 5, 'fill offset x should be 5');
             test(circle.getFill().offset.y === 4, 'fill offset y should be 4');
-            
+
             circle.setFill({
-                offset : {
-                    y : 6
+                offset: {
+                    y: 6
                 }
             });
             test(circle.getFill().offset.x === 5, 'fill offset x should be 5');
             test(circle.getFill().offset.y === 6, 'fill offset y should be 6');
-            
+
             circle.setFill({
-                offset : [-200, -70]
+                offset: [-200, -70]
             });
         };
         imageObj.src = '../assets/darth-vader.jpg';
-        
+
     },
-    'SHAPE - add circle with radial gradient fill' : function (containerId) {
+    'SHAPE - add circle with radial gradient fill': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : {
-                    start : {
-                        x : -20,
-                        y : -20,
-                        radius : 0
-                    },
-                    end : {
-                        x : -60,
-                        y : -60,
-                        radius : 130
-                    },
-                    colorStops : [0, 'red', 0.2, 'yellow', 1, 'blue']
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: {
+                start: {
+                    x: -20,
+                    y: -20,
+                    radius: 0
                 },
-                name : 'myCircle',
-                draggable : true,
-                scale : {
-                    x : 0.5,
-                    y : 0.5
-                }
-            });
-        
+                end: {
+                    x: -60,
+                    y: -60,
+                    radius: 130
+                },
+                colorStops: [0, 'red', 0.2, 'yellow', 1, 'blue']
+            },
+            name: 'myCircle',
+            draggable: true,
+            scale: {
+                x: 0.5,
+                y: 0.5
+            }
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
+
         var fill = circle.getFill();
-        
+
         test(fill.start.x === -20, 'fill start x should be 20');
         test(fill.start.y === -20, 'fill start y should be 20');
         test(fill.start.radius === 0, 'fill start radius should be 0');
-        
+
         test(fill.end.x === -60, 'fill end x should be 60');
         test(fill.end.y === -60, 'fill end y should be 60');
         test(fill.end.radius === 130, 'fill end radius should be 130');
-        
+
         test(fill.colorStops.length === 6, 'fill colorStops length should be 6');
-        
+
     },
-    'SHAPE - add rect' : function (containerId) {
+    'SHAPE - add rect': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 90,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                offset : {
-                    x : 50
-                },
-                scale : [2, 2],
-                cornerRadius : 15,
-                draggable : true
-            });
-        
+            x: 200,
+            y: 90,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            offset: {
+                x: 50
+            },
+            scale: [2, 2],
+            cornerRadius: 15,
+            draggable: true
+        });
+
         layer.add(rect);
         stage.add(layer);
     },
-    'SHAPE - add circle using Ellipse' : function (containerId) {
+    'SHAPE - add circle using Ellipse': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         layer.add(circle);
         stage.add(layer);
     },
-    'SHAPE - add circle using Circle' : function (containerId) {
+    'SHAPE - add circle using Circle': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Circle({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         layer.add(circle);
         stage.add(layer);
     },
-    'SHAPE - add ellipse' : function (containerId) {
+    'SHAPE - add ellipse': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : [70, 35],
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 8
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: [70, 35],
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 8
+        });
         layer.add(circle);
         stage.add(layer);
     },
-
-    'SHAPE - add shape with custom attr pointing to self' : function (containerId) {
+    'SHAPE - add shape with custom attr pointing to self': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                offset : {
-                    x : 0,
-                    y : 0
-                },
-                scale : {
-                    x : 2,
-                    y : 2
-                }
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            offset: {
+                x: 0,
+                y: 0
+            },
+            scale: {
+                x: 2,
+                y: 2
+            }
+        });
         layer.add(circle);
         stage.add(layer);
-        
+
         /*
          * add custom attr that points to self.  The setAttrs method should
          * not inifinitely recurse causing a stack overflow
          */
         circle.setAttrs({
-            self : circle
+            self: circle
         });
-        
+
         /*
          * serialize the stage.  The json should succeed because objects that have
          * methods, such as self, are not serialized, and will therefore avoid
@@ -1475,58 +1474,58 @@ Test.prototype.tests = {
          */
         var json = stage.toJSON();
     },
-    'SHAPE - set fill after instantiation' : function (containerId) {
+    'SHAPE - set fill after instantiation': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
         layer.add(circle);
-        
+
         circle.setFill('blue');
-        
+
         stage.add(layer);
     },
-    'SHAPE - add image' : function (containerId) {
+    'SHAPE - add image': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer({
-                    throttle : 999
-                });
+                throttle: 999
+            });
             darth = new Kinetic.Image({
-                    x : 200,
-                    y : 60,
-                    image : imageObj,
-                    width : 100,
-                    height : 100,
-                    offset : [50, 30],
-                    crop : [135, 7, 167, 134],
-                    cornerRadius : 20
-                });
-            
+                x: 200,
+                y: 60,
+                image: imageObj,
+                width: 100,
+                height: 100,
+                offset: [50, 30],
+                crop: [135, 7, 167, 134],
+                cornerRadius: 20
+            });
+
             layer.add(darth);
             stage.add(layer);
-            
+
             darth.setHeight(200);
             layer.draw();
-            
+
             darth.setHeight(100);
             layer.draw();
-            
+
             test(darth.getX() === 200, 'x should be 200');
             test(darth.getY() === 60, 'y should be 60');
             test(darth.getWidth() === 100, 'width should be 100');
@@ -1534,14 +1533,14 @@ Test.prototype.tests = {
             test(darth.getOffset().x === 50, 'center offset x should be 50');
             test(darth.getOffset().y === 30, 'center offset y should be 30');
             test(Kinetic.Type._isElement(darth.getImage()), 'darth image should be an element');
-            
+
             var crop = null;
             crop = darth.getCrop();
             test(crop.x === 135, 'crop x should be 135');
             test(crop.y === 7, 'crop y should be 7');
             test(crop.width === 167, 'crop width should be 167');
             test(crop.height === 134, 'crop height should be134');
-            
+
             /*
              * test cropping setter
              */
@@ -1551,97 +1550,97 @@ Test.prototype.tests = {
             test(crop.y === 1, 'crop y should be 1');
             test(crop.width === 2, 'crop width should be2');
             test(crop.height === 3, 'crop height should be 3');
-            
+
             darth.setCrop([4, 5, 6, 7]);
             crop = darth.getCrop();
             test(crop.x === 4, 'crop x should be 4');
             test(crop.y === 5, 'crop y should be 5');
             test(crop.width === 6, 'crop width should be 6');
             test(crop.height === 7, 'crop height should be 7');
-            
+
             darth.setCrop({
-                x : 8,
-                y : 9,
-                width : 10,
-                height : 11
+                x: 8,
+                y: 9,
+                width: 10,
+                height: 11
             });
             crop = darth.getCrop();
             test(crop.x === 8, 'crop x should be 8');
             test(crop.y === 9, 'crop y should be 9');
             test(crop.width === 10, 'crop width should be 10');
             test(crop.height === 11, 'crop height should be 11');
-            
+
             /*
              * test crop partial setter
              */
             darth.setCrop({
-                x : 12
+                x: 12
             });
             crop = darth.getCrop();
             test(crop.x === 12, 'crop x should be 12');
             test(crop.y === 9, 'crop y should be 9');
             test(crop.width === 10, 'crop width should be 10');
             test(crop.height === 11, 'crop height should be 11');
-            
+
             darth.setCrop({
-                y : 13
+                y: 13
             });
             crop = darth.getCrop();
             test(crop.x === 12, 'crop x should be 12');
             test(crop.y === 13, 'crop y should be 13');
             test(crop.width === 10, 'crop width should be 10');
             test(crop.height === 11, 'crop height should be 11');
-            
+
             darth.setCrop({
-                width : 14
+                width: 14
             });
             crop = darth.getCrop();
             test(crop.x === 12, 'crop x should be 12');
             test(crop.y === 13, 'crop y should be 13');
             test(crop.width === 14, 'crop width should be 14');
             test(crop.height === 11, 'crop height should be 11');
-            
+
             darth.setCrop({
-                height : 15
+                height: 15
             });
             crop = darth.getCrop();
             test(crop.x === 12, 'crop x should be 12');
             test(crop.y === 13, 'crop y should be 13');
             test(crop.width === 14, 'crop width should be 14');
             test(crop.height === 15, 'crop height should be 15');
-            
+
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'SHAPE - filter image' : function (containerId) {
+    'SHAPE - filter image': function(containerId) {
         var urls = dataUrls['SHAPE - filter image'];
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer({
-                    throttle : 999
-                });
+                throttle: 999
+            });
             darth = new Kinetic.Image({
-                    x : 10,
-                    y : 10,
-                    image : imageObj,
-                    draggable : true,
-                    stroke : 'red'
-                });
-            
+                x: 10,
+                y: 10,
+                image: imageObj,
+                draggable: true,
+                stroke: 'red'
+            });
+
             layer.add(darth);
             stage.add(layer);
-            
+
             test(darth.getWidth() === 438, 'image width should be 438');
             test(darth.getHeight() === 300, 'image height should be 300');
-            
+
             darth.applyFilter({
-                filter : Kinetic.Filters.Grayscale,
-                callback : function () {
+                filter: Kinetic.Filters.Grayscale,
+                callback: function() {
                     layer.draw();
                     warn(layer.toDataURL() === urls[0], 'data url is incorrect');
                 }
@@ -1649,47 +1648,47 @@ Test.prototype.tests = {
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'SHAPE - filter transformed image' : function (containerId) {
+    'SHAPE - filter transformed image': function(containerId) {
         var urls = dataUrls['SHAPE - filter transformed image'];
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer({
-                    throttle : 999
-                });
+                throttle: 999
+            });
             darth = new Kinetic.Image({
-                    x : 50,
-                    y : 50,
-                    //width: 438,
-                    //height: 300,
-                    image : imageObj,
-                    draggable : true,
-                    stroke : 'red',
-                    strokeWidth : 5,
-                    rotationDeg : 10,
-                    scale : 0.3
-                });
-            
+                x: 50,
+                y: 50,
+                //width: 438,
+                //height: 300,
+                image: imageObj,
+                draggable: true,
+                stroke: 'red',
+                strokeWidth: 5,
+                rotationDeg: 10,
+                scale: 0.3
+            });
+
             darth.setOffset(darth.getWidth() / 2, darth.getHeight() / 2);
-            
+
             layer.add(darth);
             stage.add(layer);
-            
+
             test(darth.getWidth() === 438, 'image width should be 438');
             test(darth.getHeight() === 300, 'image height should be 300');
-            
-            stage.onFrame(function () {
+
+            stage.onFrame(function() {
                 darth.rotate(0.1);
                 layer.draw();
             });
-            
+
             darth.applyFilter({
-                filter : Kinetic.Filters.Grayscale,
-                callback : function () {
+                filter: Kinetic.Filters.Grayscale,
+                callback: function() {
                     //stage.start();
                     layer.draw();
                     warn(layer.toDataURL() === urls[0], 'data url is incorrect');
@@ -1698,779 +1697,774 @@ Test.prototype.tests = {
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'SHAPE - set image fill to color then image' : function (containerId) {
+    'SHAPE - set image fill to color then image': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer();
             var circle = new Kinetic.Ellipse({
-                    x : 200,
-                    y : 60,
-                    radius : 50,
-                    fill : 'blue'
-                });
-            
+                x: 200,
+                y: 60,
+                radius: 50,
+                fill: 'blue'
+            });
+
             layer.add(circle);
             stage.add(layer);
-            
+
             test(circle.getFill() === 'blue', 'circle fill should be blue');
-            
+
             circle.setFill({
-                image : imageObj,
-                repeat : 'no-repeat',
-                offset : [-200, -70]
+                image: imageObj,
+                repeat: 'no-repeat',
+                offset: [-200, -70]
             });
-            
+
             test(circle.getFill().image !== undefined, 'circle fill image should be defined');
             test(circle.getFill().repeat === 'no-repeat', 'circle fill repeat should be no-repeat');
             test(circle.getFill().offset.x === -200, 'circle fill offset x should be -200');
             test(circle.getFill().offset.y === -70, 'circle fill offset y should be -70');
-            
+
             layer.draw();
         };
         imageObj.src = '../assets/darth-vader.jpg';
     },
-    'SHAPE - add sprite' : function (containerId) {
+    'SHAPE - add sprite': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer();
-            
+
             var anims = {
-                standing : [{
-                        x : 0,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }, {
-                        x : 52,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }, {
-                        x : 105,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }, {
-                        x : 158,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }, {
-                        x : 210,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }, {
-                        x : 262,
-                        y : 0,
-                        width : 49,
-                        height : 109
-                    }
-                ],
-                
-                kicking : [{
-                        x : 0,
-                        y : 109,
-                        width : 45,
-                        height : 98
-                    }, {
-                        x : 45,
-                        y : 109,
-                        width : 45,
-                        height : 98
-                    }, {
-                        x : 95,
-                        y : 109,
-                        width : 63,
-                        height : 98
-                    }, {
-                        x : 156,
-                        y : 109,
-                        width : 70,
-                        height : 98
-                    }, {
-                        x : 229,
-                        y : 109,
-                        width : 60,
-                        height : 98
-                    }, {
-                        x : 287,
-                        y : 109,
-                        width : 41,
-                        height : 98
-                    }
-                ]
+                standing: [{
+                    x: 0,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }, {
+                    x: 52,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }, {
+                    x: 105,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }, {
+                    x: 158,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }, {
+                    x: 210,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }, {
+                    x: 262,
+                    y: 0,
+                    width: 49,
+                    height: 109
+                }],
+
+                kicking: [{
+                    x: 0,
+                    y: 109,
+                    width: 45,
+                    height: 98
+                }, {
+                    x: 45,
+                    y: 109,
+                    width: 45,
+                    height: 98
+                }, {
+                    x: 95,
+                    y: 109,
+                    width: 63,
+                    height: 98
+                }, {
+                    x: 156,
+                    y: 109,
+                    width: 70,
+                    height: 98
+                }, {
+                    x: 229,
+                    y: 109,
+                    width: 60,
+                    height: 98
+                }, {
+                    x: 287,
+                    y: 109,
+                    width: 41,
+                    height: 98
+                }]
             };
-            
+
             //for(var n = 0; n < 50; n++) {
             sprite = new Kinetic.Sprite({
-                    //x: Math.random() * stage.getWidth() - 30,
-                    x : 200,
-                    //y: Math.random() * stage.getHeight() - 50,
-                    y : 50,
-                    image : imageObj,
-                    animation : 'standing',
-                    animations : anims,
-                    index : 0,
-                    frameRate : Math.random() * 6 + 6,
-                    frameRate : 10,
-                    draggable : true,
-                    shadow : {
-                        color : 'black',
-                        blur : 3,
-                        offset : [3, 1],
-                        alpha : 0.3
-                    }
-                });
-            
+                //x: Math.random() * stage.getWidth() - 30,
+                x: 200,
+                //y: Math.random() * stage.getHeight() - 50,
+                y: 50,
+                image: imageObj,
+                animation: 'standing',
+                animations: anims,
+                index: 0,
+                frameRate: Math.random() * 6 + 6,
+                frameRate: 10,
+                draggable: true,
+                shadow: {
+                    color: 'black',
+                    blur: 3,
+                    offset: [3, 1],
+                    alpha: 0.3
+                }
+            });
+
             layer.add(sprite);
             sprite.start();
             //}
-            
+
             stage.add(layer);
-            
+
             // kick once
-            setTimeout(function () {
+            setTimeout(function() {
                 sprite.setAnimation('kicking');
-                
-                sprite.afterFrame(5, function () {
+
+                sprite.afterFrame(5, function() {
                     sprite.setAnimation('standing');
                 });
             }, 2000);
-            setTimeout(function () {
+            setTimeout(function() {
                 sprite.stop();
             }, 3000);
         };
         imageObj.src = '../assets/scorpion-sprite.png';
     },
-    'Node - node caching' : function (containerId) {
+    'Node - node caching': function(containerId) {
         var urls = dataUrls['Node - node caching'];
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
+
         var points = [{
-                x : 73,
-                y : 250
-            }, {
-                x : 73,
-                y : 160
-            }, {
-                x : 340,
-                y : 23
-            }, {
-                x : 500,
-                y : 109
-            }, {
-                x : 499,
-                y : 139
-            }, {
-                x : 342,
-                y : 93
-            }
-        ];
-        
+            x: 73,
+            y: 250
+        }, {
+            x: 73,
+            y: 160
+        }, {
+            x: 340,
+            y: 23
+        }, {
+            x: 500,
+            y: 109
+        }, {
+            x: 499,
+            y: 139
+        }, {
+            x: 342,
+            y: 93
+        }];
+
         var poly = new Kinetic.Polygon({
-                points : points,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                draggable : true
-            });
-        
+            points: points,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            draggable: true
+        });
+
         group.add(poly);
         layer.add(group);
         stage.add(layer);
-        
+
         poly.toImage({
-            width : 500,
-            height : 300,
-            callback : function (imageObj) {
+            width: 500,
+            height: 300,
+            callback: function(imageObj) {
                 test(Kinetic.Type._isElement(imageObj), 'shape toImage() should be an image object');
-                
+
                 var cachedShape = new Kinetic.Image({
-                        image : imageObj,
-                        draggable : true,
-                        stroke : 'red',
-                        strokeWidth : 5,
-                        x : 50,
-                        y : -120
-                    });
-                
+                    image: imageObj,
+                    draggable: true,
+                    stroke: 'red',
+                    strokeWidth: 5,
+                    x: 50,
+                    y: -120
+                });
+
                 layer.add(cachedShape);
                 layer.draw();
-                
+
                 warn(urls[0] === layer.toDataURL(), 'layer data url is incorrect');
             }
         });
-        
+
         group.toImage({
-            callback : function (imageObj) {
+            callback: function(imageObj) {
                 test(Kinetic.Type._isElement(imageObj), 'group toImage() should be an image object');
             }
         });
         layer.toImage({
-            callback : function (imageObj) {
+            callback: function(imageObj) {
                 test(Kinetic.Type._isElement(imageObj), 'layer toImage() should be an image object');
             }
         });
         stage.toImage({
-            callback : function (imageObj) {
+            callback: function(imageObj) {
                 test(Kinetic.Type._isElement(imageObj), 'stage toImage() should be an image object');
             }
         });
     },
-    'SHAPE - add polygon' : function (containerId) {
+    'SHAPE - add polygon': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var points = [{
-                x : 73,
-                y : 192
-            }, {
-                x : 73,
-                y : 160
-            }, {
-                x : 340,
-                y : 23
-            }, {
-                x : 500,
-                y : 109
-            }, {
-                x : 499,
-                y : 139
-            }, {
-                x : 342,
-                y : 93
-            }
-        ];
-        
+            x: 73,
+            y: 192
+        }, {
+            x: 73,
+            y: 160
+        }, {
+            x: 340,
+            y: 23
+        }, {
+            x: 500,
+            y: 109
+        }, {
+            x: 499,
+            y: 139
+        }, {
+            x: 342,
+            y: 93
+        }];
+
         var poly = new Kinetic.Polygon({
-                points : points,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5
-            });
-        
+            points: points,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5
+        });
+
         layer.add(poly);
         stage.add(layer);
-        
-        stage.onFrame(function () {
+
+        stage.onFrame(function() {
             poly.rotate(Math.PI / 100);
             layer.draw();
         });
         //stage.start();
     },
-    'SHAPE - add line' : function (containerId) {
+    'SHAPE - add line': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var points = [{
-                x : 73,
-                y : 160
-            }, {
-                x : 340,
-                y : 23
-            }
-            /*, {
-            x: 500,
-            y: 109
-            }*/
+            x: 73,
+            y: 160
+        }, {
+            x: 340,
+            y: 23
+        }
+        /*, {
+         x: 500,
+         y: 109
+         }*/
         ];
-        
+
         var line = new Kinetic.Line({
-                points : points,
-                stroke : 'blue',
-                strokeWidth : 20,
-                lineCap : 'round',
-                lineJoin : 'round',
-                draggable : true
-            });
-        
+            points: points,
+            stroke: 'blue',
+            strokeWidth: 20,
+            lineCap: 'round',
+            lineJoin: 'round',
+            draggable: true
+        });
+
         // test that default detection type is pixel
         test(line.getDetectionType() === 'pixel', 'dection type should be pixel');
-        
+
         layer.add(line);
         stage.add(layer);
-        
+
         line.saveImageData();
-        
-        line.on('dragend', function () {
+
+        line.on('dragend', function() {
             line.saveImageData();
         });
-        
+
         line.setPoints([1, 2, 3, 4]);
         test(line.getPoints()[0].x === 1, 'first point x should be 1');
-        
+
         line.setPoints([{
-                    x : 5,
-                    y : 6
-                }, {
-                    x : 7,
-                    y : 8
-                }
-            ]);
+            x: 5,
+            y: 6
+        }, {
+            x: 7,
+            y: 8
+        }]);
         test(line.getPoints()[0].x === 5, 'first point x should be 5');
-        
+
         line.setPoints([73, 160, 340, 23]);
         test(line.getPoints()[0].x === 73, 'first point x should be 73');
     },
-    'SHAPE - add dashed line' : function (containerId) {
+    'SHAPE - add dashed line': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         /*
-        var points = [{
-        x: 73,
-        y: 160
-        }, {
-        x: 340,
-        y: 23
-        }, {
-        x: 500,
-        y: 109
-        }, {
-        x: 500,
-        y: 180
-        }];
+         var points = [{
+         x: 73,
+         y: 160
+         }, {
+         x: 340,
+         y: 23
+         }, {
+         x: 500,
+         y: 109
+         }, {
+         x: 500,
+         y: 180
+         }];
          */
-        
+
         var line = new Kinetic.Line({
-                points : [73, 160, 340, 23, 500, 109, 500, 180],
-                stroke : 'blue',
-                strokeWidth : 5,
-                lineCap : 'round',
-                lineJoin : 'round',
-                draggable : true,
-                dashArray : [30, 10, 0, 10, 10, 20],
-                shadow : {
-                    color : '#aaa',
-                    blur : 10,
-                    offset : [20, 20]
-                }
-            });
-        
+            points: [73, 160, 340, 23, 500, 109, 500, 180],
+            stroke: 'blue',
+            strokeWidth: 5,
+            lineCap: 'round',
+            lineJoin: 'round',
+            draggable: true,
+            dashArray: [30, 10, 0, 10, 10, 20],
+            shadow: {
+                color: '#aaa',
+                blur: 10,
+                offset: [20, 20]
+            }
+        });
+
         layer.add(line);
         stage.add(layer);
-        
+
         test(line.getDashArray().length === 6, 'dashArray should have 6 elements');
         line.setDashArray([10, 10]);
         test(line.getDashArray().length === 2, 'dashArray should have 2 elements');
-        
+
         test(line.getPoints().length === 4, 'line should have 4 points');
-        
+
     },
-    'SHAPE - add regular polygon triangle' : function (containerId) {
+    'SHAPE - add regular polygon triangle': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var poly = new Kinetic.Plugins.RegularPolygon({
-                x : 200,
-                y : 100,
-                sides : 3,
-                radius : 50,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                name : 'foobar',
-                offset : {
-                    x : 0,
-                    y : -50
-                }
-            });
-        
+            x: 200,
+            y: 100,
+            sides: 3,
+            radius: 50,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            name: 'foobar',
+            offset: {
+                x: 0,
+                y: -50
+            }
+        });
+
         layer.add(poly);
         stage.add(layer);
-        
+
     },
-    'SHAPE - add regular polygon square' : function (containerId) {
+    'SHAPE - add regular polygon square': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var poly = new Kinetic.Plugins.RegularPolygon({
-                x : 200,
-                y : 100,
-                sides : 4,
-                radius : 50,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                name : 'foobar'
-            });
-        
+            x: 200,
+            y: 100,
+            sides: 4,
+            radius: 50,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            name: 'foobar'
+        });
+
         layer.add(poly);
         stage.add(layer);
     },
-    'SHAPE - add regular polygon pentagon' : function (containerId) {
+    'SHAPE - add regular polygon pentagon': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var poly = new Kinetic.Plugins.RegularPolygon({
-                x : 200,
-                y : 100,
-                sides : 5,
-                radius : 50,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                name : 'foobar'
-            });
-        
+            x: 200,
+            y: 100,
+            sides: 5,
+            radius: 50,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            name: 'foobar'
+        });
+
         layer.add(poly);
         stage.add(layer);
     },
-    'SHAPE - add regular polygon octogon' : function (containerId) {
+    'SHAPE - add regular polygon octogon': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var poly = new Kinetic.Plugins.RegularPolygon({
-                x : 200,
-                y : 100,
-                sides : 8,
-                radius : 50,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                name : 'foobar'
-            });
-        
+            x: 200,
+            y: 100,
+            sides: 8,
+            radius: 50,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            name: 'foobar'
+        });
+
         layer.add(poly);
         stage.add(layer);
     },
-    'SHAPE - add five point star' : function (containerId) {
+    'SHAPE - add five point star': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var star = new Kinetic.Plugins.Star({
-                x : 200,
-                y : 100,
-                numPoints : 5,
-                innerRadius : 40,
-                outerRadius : 70,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                name : 'foobar',
-                offset : {
-                    x : 0,
-                    y : -70
-                },
-                scale : {
-                    x : 0.5,
-                    y : 0.5
-                }
-            });
-        
+            x: 200,
+            y: 100,
+            numPoints: 5,
+            innerRadius: 40,
+            outerRadius: 70,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            name: 'foobar',
+            offset: {
+                x: 0,
+                y: -70
+            },
+            scale: {
+                x: 0.5,
+                y: 0.5
+            }
+        });
+
         layer.add(star);
         stage.add(layer);
     },
-    'SHAPE - add five point star with line join and shadow' : function (containerId) {
+    'SHAPE - add five point star with line join and shadow': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var rect = new Kinetic.Rect({
-                x : 250,
-                y : 75,
-                width : 100,
-                height : 100,
-                fill : 'red'
-            });
-        
+            x: 250,
+            y: 75,
+            width: 100,
+            height: 100,
+            fill: 'red'
+        });
+
         var star = new Kinetic.Plugins.Star({
-                x : 200,
-                y : 100,
-                numPoints : 5,
-                innerRadius : 40,
-                outerRadius : 70,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5,
-                lineJoin : "round",
-                shadow : {
-                    color : 'black',
-                    blur : 10,
-                    offset : [20, 20],
-                    alpha : 0.5
-                },
-                draggable : true
-            });
-        
+            x: 200,
+            y: 100,
+            numPoints: 5,
+            innerRadius: 40,
+            outerRadius: 70,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5,
+            lineJoin: "round",
+            shadow: {
+                color: 'black',
+                blur: 10,
+                offset: [20, 20],
+                alpha: 0.5
+            },
+            draggable: true
+        });
+
         layer.add(rect);
         layer.add(star);
-        
+
         stage.add(layer);
-        
+
         test(star.getLineJoin() === 'round', 'lineJoin property should be round');
         star.setLineJoin('bevel');
         test(star.getLineJoin() === 'bevel', 'lineJoin property should be bevel');
-        
+
         star.setLineJoin('round');
         /*
-        stage.onFrame(function(frame) {
-        star.rotate(1 * frame.timeDiff / 1000);
-        layer.draw();
-        });
-        
-        stage.start();
+         stage.onFrame(function(frame) {
+         star.rotate(1 * frame.timeDiff / 1000);
+         layer.draw();
+         });
+
+         stage.start();
          */
     },
-    'SHAPE - add stroke rect' : function (containerId) {
+    'SHAPE - add stroke rect': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                stroke : 'green',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            stroke: 'green',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
     },
-    'SHAPE - use default stroke (stroke color should be black)' : function (containerId) {
+    'SHAPE - use default stroke (stroke color should be black)': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
     },
-    'SHAPE - use default stroke width (stroke width should be 2)' : function (containerId) {
+    'SHAPE - use default stroke width (stroke width should be 2)': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                stroke : 'blue'
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            stroke: 'blue'
+        });
+
         layer.add(rect);
         stage.add(layer);
     },
-    'SHAPE - scale shape by half' : function (containerId) {
+    'SHAPE - scale shape by half': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         circle.setScale(0.5, 1);
         layer.add(circle);
         stage.add(layer);
     },
-    'SHAPE - scale shape by half then back to 1' : function (containerId) {
+    'SHAPE - scale shape by half then back to 1': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         circle.setScale(0.5, 1);
         circle.setScale(1, 1);
         layer.add(circle);
         stage.add(layer);
     },
-    'SHAPE - set center offset after instantiation' : function (containerId) {
+    'SHAPE - set center offset after instantiation': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                stroke : 'blue',
-                offset : {
-                    x : 20,
-                    y : 20
-                }
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            stroke: 'blue',
+            offset: {
+                x: 20,
+                y: 20
+            }
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         test(rect.getOffset().x === 20, 'center offset x should be 20');
         test(rect.getOffset().y === 20, 'center offset y should be 20');
-        
+
         rect.setOffset(40, 40);
-        
+
         test(rect.getOffset().x === 40, 'center offset x should be 40');
         test(rect.getOffset().y === 40, 'center offset y should be 40');
-        
+
     },
-    'SHAPE - apply shadow to transparent image' : function (containerId) {
+    'SHAPE - apply shadow to transparent image': function(containerId) {
         var imageObj = new Image();
-        imageObj.onload = function () {
+        imageObj.onload = function() {
             var stage = new Kinetic.Stage({
-                    container : containerId,
-                    width : 578,
-                    height : 200
-                });
+                container: containerId,
+                width: 578,
+                height: 200
+            });
             var layer = new Kinetic.Layer();
             var darth = new Kinetic.Image({
-                    x : 200,
-                    y : 40,
-                    image : imageObj,
-                    draggable : true,
-                    shadow : {
-                        color : 'black',
-                        blur : 10,
-                        offset : [20, 20],
-                        alpha : 0.2
-                    }
-                });
-            
+                x: 200,
+                y: 40,
+                image: imageObj,
+                draggable: true,
+                shadow: {
+                    color: 'black',
+                    blur: 10,
+                    offset: [20, 20],
+                    alpha: 0.2
+                }
+            });
+
             layer.add(darth);
             stage.add(layer);
-            
+
         };
         imageObj.src = '../assets/lion.png';
     },
-    'SHAPE - custom shape with fill, stroke, and strokeWidth' : function (containerId) {
+    'SHAPE - custom shape with fill, stroke, and strokeWidth': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var shape = new Kinetic.Shape({
-                drawFunc : function (context) {
-                    context.beginPath();
-                    context.moveTo(0, 0);
-                    context.lineTo(100, 0);
-                    context.lineTo(100, 100);
-                    context.closePath();
-                    this.fill(context);
-                    this.stroke(context);
-                },
-                x : 200,
-                y : 100,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5
-            });
-        
+            drawFunc: function(context) {
+                context.beginPath();
+                context.moveTo(0, 0);
+                context.lineTo(100, 0);
+                context.lineTo(100, 100);
+                context.closePath();
+                this.fill(context);
+                this.stroke(context);
+            },
+            x: 200,
+            y: 100,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5
+        });
+
         layer.add(shape);
         stage.add(layer);
     },
-    'SHAPE - change custom shape draw func' : function (containerId) {
+    'SHAPE - change custom shape draw func': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var shape = new Kinetic.Shape({
-                drawFunc : function (context) {
-                    context.beginPath();
-                    context.moveTo(0, 0);
-                    context.lineTo(100, 0);
-                    context.lineTo(100, 100);
-                    context.closePath();
-                    this.fill(context);
-                    this.stroke(context);
-                },
-                x : 200,
-                y : 100,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 5
-            });
-        
-        shape.setDrawFunc(function (context) {
+            drawFunc: function(context) {
+                context.beginPath();
+                context.moveTo(0, 0);
+                context.lineTo(100, 0);
+                context.lineTo(100, 100);
+                context.closePath();
+                this.fill(context);
+                this.stroke(context);
+            },
+            x: 200,
+            y: 100,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 5
+        });
+
+        shape.setDrawFunc(function(context) {
             context.beginPath();
             context.moveTo(0, 0);
             context.lineTo(200, 0);
@@ -2479,260 +2473,260 @@ Test.prototype.tests = {
             this.fill(context);
             this.stroke(context);
         });
-        
+
         layer.add(shape);
         stage.add(layer);
     },
-    'SHAPE - init with position, scale, rotation, then change scale' : function (containerId) {
+    'SHAPE - init with position, scale, rotation, then change scale': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                scale : {
-                    x : 0.5,
-                    y : 0.5
-                },
-                rotation : 20 * Math.PI / 180
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            scale: {
+                x: 0.5,
+                y: 0.5
+            },
+            rotation: 20 * Math.PI / 180
+        });
+
         test(rect.getPosition().x == 200, 'rect should be at x = 200');
         test(rect.getPosition().y == 100, 'rect should be at y = 100');
         test(rect.getScale().x == 0.5, 'rect x scale should be 0.5');
         test(rect.getScale().y == 0.5, 'rect y scale should be 0.5');
         test(rect.getRotation() == 20 * Math.PI / 180, 'rect should rotated by 20 degrees');
-        
+
         rect.setScale(2, 0.3);
         test(rect.getScale().x == 2, 'rect x scale should be 2');
         test(rect.getScale().y == 0.3, 'rect y scale should be 0.3');
-        
+
         layer.add(rect);
         stage.add(layer);
     },
-    'SHAPE - rotation in degrees' : function (containerId) {
+    'SHAPE - rotation in degrees': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                rotationDeg : 10
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            rotationDeg: 10
+        });
+
         test(rect.getRotationDeg() === 10, 'rotation should be 10 degrees');
         rect.setRotationDeg(20);
         test(rect.getRotationDeg() === 20, 'rotation should be 20 degrees');
         rect.rotateDeg(20);
         test(rect.getRotationDeg() === 40, 'rotation should be 40 degrees');
-        
+
         layer.add(rect);
         stage.add(layer);
     },
-    'NODE - test pixel detection setter and getter' : function (containerId) {
+    'NODE - test pixel detection setter and getter': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+
         var layer = new Kinetic.Layer({
-                rotationDeg : 20
-            });
+            rotationDeg: 20
+        });
         var star = new Kinetic.Plugins.Star({
-                x : 200,
-                y : 100,
-                numPoints : 10,
-                innerRadius : 40,
-                outerRadius : 70,
-                fill : 'green',
-                stroke : 'blue',
-                strokeWidth : 20,
-                detectionType : 'pixel',
-                draggable : true
-            });
-        
-        star.on('mouseover', function () {
+            x: 200,
+            y: 100,
+            numPoints: 10,
+            innerRadius: 40,
+            outerRadius: 70,
+            fill: 'green',
+            stroke: 'blue',
+            strokeWidth: 20,
+            detectionType: 'pixel',
+            draggable: true
+        });
+
+        star.on('mouseover', function() {
             log('mouseover');
         });
-        
-        star.on('mouseout', function () {
+
+        star.on('mouseout', function() {
             log('mouseout');
         });
-        
-        star.on('dragend', function () {
+
+        star.on('dragend', function() {
             this.saveImageData();
         });
-        
+
         layer.add(star);
         stage.add(layer);
-        
+
         star.saveImageData();
-        
+
         test(star.getDetectionType() === 'pixel', 'detection type should be pixel');
         star.setDetectionType('path');
         test(star.getDetectionType() === 'path', 'detection type should be path');
         star.setDetectionType('pixel');
         test(star.getDetectionType() === 'pixel', 'detection type should be pixel');
     },
-    'SHAPE - test intersects()' : function (containerId) {
+    'SHAPE - test intersects()': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         test(rect.intersects({
-                x : 200,
-                y : 100
-            }) === true, 'problem with point in shape');
-        
+            x: 200,
+            y: 100
+        }) === true, 'problem with point in shape');
+
         test(rect.intersects({
-                x : 199,
-                y : 99
-            }) === false, 'intersects with point in shape');
-        
+            x: 199,
+            y: 99
+        }) === false, 'intersects with point in shape');
+
         test(rect.intersects({
-                x : 250,
-                y : 125
-            }) === true, 'intersects with point in shape');
-        
+            x: 250,
+            y: 125
+        }) === true, 'intersects with point in shape');
+
         test(rect.intersects({
-                x : 300,
-                y : 150
-            }) === true, 'intersects with point in shape');
-        
+            x: 300,
+            y: 150
+        }) === true, 'intersects with point in shape');
+
         test(rect.intersects({
-                x : 301,
-                y : 151
-            }) === false, 'intersects with point in shape');
+            x: 301,
+            y: 151
+        }) === false, 'intersects with point in shape');
     },
-    'CONTAINER - node type selector' : function (containerId) {
+    'CONTAINER - node type selector': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var fooLayer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
+
         var blue = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'blue'
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'blue'
+        });
+
         var red = new Kinetic.Rect({
-                x : 250,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            x: 250,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         group.add(red);
         layer.add(blue);
         layer.add(group);
         stage.add(layer);
         stage.add(fooLayer);
-        
+
         test(stage.get('Shape').length === 2, 'stage should have 2 shapes');
         test(layer.get('Shape').length === 2, 'layer should have 2 shapes');
         test(group.get('Shape').length === 1, 'layer should have 2 shapes');
-        
+
         test(stage.get('Layer').length === 2, 'stage should have 2 layers');
         test(stage.get('Group').length === 1, 'stage should have 1 group');
-        
+
         test(layer.get('Group').length === 1, 'layer should have 1 group');
         test(layer.get('Shape').length === 2, 'layer should have 2 shapes');
         test(layer.get('Layer').length === 0, 'layer should have 0 layers');
-        
+
         test(fooLayer.get('Group').length === 0, 'layer should have 0 groups');
         test(fooLayer.get('Shape').length === 0, 'layer should have 0 shapes');
-        
+
         test(group.get('Shape').length === 1, 'group should have 1 shape');
         test(group.get('Layer').length === 0, 'group should have 0 layers');
         test(group.get('Group').length === 0, 'group should have 0 groups');
-        
+
     },
-    'SHAPE - text getters and setters' : function (containerId) {
+    'SHAPE - text getters and setters': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var text = new Kinetic.Text({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                stroke : '#555',
-                strokeWidth : 5,
-                fill : '#ddd',
-                text : 'Hello World!',
-                fontSize : 50,
-                fontFamily : 'Calibri',
-                fontStyle : 'normal',
-                textFill : '#888',
-                textStroke : '#333',
-                align : 'right',
-                lineHeight : 1.2,
-                width : 400,
-                height : 100,
-                padding : 10,
-                shadow : {
-                    color : 'black',
-                    blur : 1,
-                    offset : [10, 10],
-                    alpha : 0.2
-                },
-                cornerRadius : 10,
-                draggable : true,
-                detectionType : 'path'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            stroke: '#555',
+            strokeWidth: 5,
+            fill: '#ddd',
+            text: 'Hello World!',
+            fontSize: 50,
+            fontFamily: 'Calibri',
+            fontStyle: 'normal',
+            textFill: '#888',
+            textStroke: '#333',
+            align: 'right',
+            lineHeight: 1.2,
+            width: 400,
+            height: 100,
+            padding: 10,
+            shadow: {
+                color: 'black',
+                blur: 1,
+                offset: [10, 10],
+                alpha: 0.2
+            },
+            cornerRadius: 10,
+            draggable: true,
+            detectionType: 'path'
+        });
+
         // center text box
         text.setOffset(text.getBoxWidth() / 2, text.getBoxHeight() / 2);
-        
+
         layer.add(text);
         stage.add(layer);
-        
+
         /*
          * test getters and setters
          */
-        
+
         test(text.getX() === stage.getWidth() / 2, 'text box x should be in center of stage');
         test(text.getY() === stage.getHeight() / 2, 'text box y should be in center of stage');
         test(text.getStroke() === '#555', 'text box stroke should be #555');
@@ -2753,12 +2747,12 @@ Test.prototype.tests = {
         test(text.getCornerRadius() === 10, 'text box corner radius should be 10');
         test(text.getDraggable() === true, 'text should be draggable');
         test(text.getDetectionType() === 'path', 'text detection type should be path');
-        
+
         test(text.getBoxWidth() === 400, 'box width should be 400');
         test(text.getBoxHeight() === 100, 'box height should be 100');
         test(text.getTextWidth() > 0, 'text width should be greater than 0');
         test(text.getTextHeight() > 0, 'text height should be greater than 0');
-        
+
         text.setX(1);
         text.setY(2);
         text.setStroke('orange');
@@ -2775,12 +2769,12 @@ Test.prototype.tests = {
         text.setHeight(75);
         text.setPadding(20);
         text.setShadow({
-            color : 'green'
+            color: 'green'
         });
         text.setCornerRadius(20);
         text.setDraggable(false);
         text.setDetectionType('pixel');
-        
+
         test(text.getX() === 1, 'text box x should be 1');
         test(text.getY() === 2, 'text box y should be 2');
         test(text.getStroke() === 'orange', 'text box stroke should be orange');
@@ -2800,144 +2794,144 @@ Test.prototype.tests = {
         test(text.getCornerRadius() === 20, 'text box corner radius should be 20');
         test(text.getDraggable() === false, 'text draggable should be false');
         test(text.getDetectionType() === 'pixel', 'text detection type should be pixel');
-        
+
     },
-    'SHAPE - text multi line' : function (containerId) {
+    'SHAPE - text multi line': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var text = new Kinetic.Text({
-                x : 10,
-                y : 10,
-                stroke : '#555',
-                strokeWidth : 5,
-                fill : '#ddd',
-                text : 'HEADING\n\nAll the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
-                //text: 'HEADING\n\nThis is a really cool paragraph. \n And this is a footer.',
-                fontSize : 16,
-                fontFamily : 'Calibri',
-                fontStyle : 'normal',
-                textFill : '#555',
-                //width: 20,
-                width : 380,
-                //width: 200,
-                padding : 20,
-                align : 'center',
-                shadow : {
-                    color : 'black',
-                    blur : 1,
-                    offset : [10, 10],
-                    alpha : 0.2
-                },
-                cornerRadius : 10,
-                draggable : true,
-                detectionType : 'path'
-            });
-        
+            x: 10,
+            y: 10,
+            stroke: '#555',
+            strokeWidth: 5,
+            fill: '#ddd',
+            text: 'HEADING\n\nAll the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
+            //text: 'HEADING\n\nThis is a really cool paragraph. \n And this is a footer.',
+            fontSize: 16,
+            fontFamily: 'Calibri',
+            fontStyle: 'normal',
+            textFill: '#555',
+            //width: 20,
+            width: 380,
+            //width: 200,
+            padding: 20,
+            align: 'center',
+            shadow: {
+                color: 'black',
+                blur: 1,
+                offset: [10, 10],
+                alpha: 0.2
+            },
+            cornerRadius: 10,
+            draggable: true,
+            detectionType: 'path'
+        });
+
         // center text box
         //text.setOffset(text.getBoxWidth() / 2, text.getBoxHeight() / 2);
-        
+
         layer.add(text);
         stage.add(layer);
-        
+
         /*
-        text.transitionTo({
-        width: 500,
-        duration: 10
-        });
+         text.transitionTo({
+         width: 500,
+         duration: 10
+         });
          */
     },
-    'SHAPE - get shape name' : function (containerId) {
+    'SHAPE - get shape name': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         test(circle.getName() == 'myCircle', 'name should be myCircle');
     },
-    'SHAPE - remove shape' : function (containerId) {
+    'SHAPE - remove shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         test(layer.children.length === 1, 'layer should have 1 children');
-        
+
         layer.remove(circle);
-        
+
         test(layer.children.length === 0, 'layer should have 0 children');
         //test(layer.getChild('myCircle') === undefined, 'shape should be null');
-        
+
         layer.draw();
     },
-    'NODE - listen and don\'t listen' : function (containerId) {
+    'NODE - listen and don\'t listen': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 50,
-                y : 50,
-                width : 200,
-                height : 50,
-                fill : 'blue'
-            });
-        
+            x: 50,
+            y: 50,
+            width: 200,
+            height: 50,
+            fill: 'blue'
+        });
+
         var rect2 = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 200,
-                height : 50,
-                fill : 'red',
-                listening : false
-            });
-        
+            x: 200,
+            y: 100,
+            width: 200,
+            height: 50,
+            fill: 'red',
+            listening: false
+        });
+
         layer.add(rect).add(rect2);
         stage.add(layer);
-        
+
         test(rect.getListening() === true, 'rect should be listening');
         rect.setListening(false);
         test(rect.getListening() === false, 'rect should not be listening');
-        
+
         test(rect2.getListening() === false, 'rect2 should not be listening');
         rect2.setListening(true);
         test(rect2.getListening() === true, 'rect2 should be listening');
     },
-    'NODE - test offset attr change' : function (containerId) {
+    'NODE - test offset attr change': function(containerId) {
         /*
          * the premise of this test to make sure that only
          * root level attributes trigger an attr change event.
@@ -2946,104 +2940,104 @@ Test.prototype.tests = {
          * object
          */
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 50,
-                y : 50,
-                width : 200,
-                height : 50,
-                fill : 'blue',
-                offset : [10, 10],
-                shadow : {
-                    color : 'black',
-                    offset : [20, 20]
-                }
-            });
-        
+            x: 50,
+            y: 50,
+            width: 200,
+            height: 50,
+            fill: 'blue',
+            offset: [10, 10],
+            shadow: {
+                color: 'black',
+                offset: [20, 20]
+            }
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         var offsetChange = false;
         var shadowOffsetChange = false;
-        
-        rect.on('offsetChange', function (val) {
+
+        rect.on('offsetChange', function(val) {
             offsetChange = true;
         });
-        
+
         rect.setOffset(1, 2);
-        
+
         rect.setShadow({
-            offset : [3, 4]
+            offset: [3, 4]
         });
-        
+
         test(offsetChange, 'offsetChange should have been triggered with setOffset()');
         test(!shadowOffsetChange, 'offsetChange should not have been triggered with setShadow()');
     },
-    'NODE - clone a shape' : function (containerId) {
+    'NODE - clone a shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 50,
-                y : 50,
-                width : 200,
-                height : 50,
-                fill : 'blue',
-                offset : [10, 10],
-                shadow : {
-                    color : 'black',
-                    offset : [20, 20]
-                },
-                draggable : true,
-                name : 'myRect'
-            });
-        
+            x: 50,
+            y: 50,
+            width: 200,
+            height: 50,
+            fill: 'blue',
+            offset: [10, 10],
+            shadow: {
+                color: 'black',
+                offset: [20, 20]
+            },
+            draggable: true,
+            name: 'myRect'
+        });
+
         var clicks = [];
-        
-        rect.on('click', function () {
+
+        rect.on('click', function() {
             clicks.push(this.getName());
         });
         var clone = rect.clone({
-                x : 300,
-                fill : 'red',
-                name : 'rectClone'
-            });
-        
+            x: 300,
+            fill: 'red',
+            name: 'rectClone'
+        });
+
         test(clone.getX() === 300, 'clone x should be 300');
         test(clone.getY() === 50, 'clone y should be 50');
         test(clone.getWidth() === 200, 'clone width should be 200');
         test(clone.getHeight() === 50, 'clone height should be 50');
         test(clone.getFill() === 'red', 'clone fill should be red');
-        
+
         test(rect.getShadow().color === 'black', 'rect shadow color should be black');
         test(clone.getShadow().color === 'black', 'clone shadow color should be black');
-        
+
         clone.setShadow({
-            color : 'green'
+            color: 'green'
         });
-        
+
         /*
          * Make sure that when we change a clone object attr that the rect object
          * attr isn't updated by reference
          */
-        
+
         test(rect.getShadow().color === 'black', 'rect shadow color should be black');
         test(clone.getShadow().color === 'green', 'clone shadow color should be green');
-        
+
         layer.add(rect);
         layer.add(clone);
         stage.add(layer);
-        
+
         // make sure private ids are different
         test(rect._id !== clone._id, 'rect and clone ids should be different');
-        
+
         // test user event binding cloning
         test(clicks.length === 0, 'no clicks should have been triggered yet');
         rect.simulate('click');
@@ -3051,707 +3045,707 @@ Test.prototype.tests = {
         clone.simulate('click');
         test(clicks.toString() === 'myRect,rectClone', 'click order should be myRect followed by rectClone');
     },
-    'NODE - test on attr change' : function (containerId) {
+    'NODE - test on attr change': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 50,
-                y : 50,
-                width : 200,
-                height : 50,
-                fill : 'blue',
-                shadow : {
-                    offset : [10, 10]
-                }
-            });
-        
+            x: 50,
+            y: 50,
+            width: 200,
+            height: 50,
+            fill: 'blue',
+            shadow: {
+                offset: [10, 10]
+            }
+        });
+
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : [70, 35],
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: [70, 35],
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(circle);
         layer.add(rect);
         stage.add(layer);
-        
+
         var widthChanged = 0;
         var shadowChanged = 0;
         var radiusChanged = 0;
-        
-        rect.on('widthChange', function (evt) {
+
+        rect.on('widthChange', function(evt) {
             widthChanged++;
             test(evt.oldVal === 200, 'old width should be 200');
             test(evt.newVal === 210, 'new width should be 210');
         });
-        
-        rect.on('shadowChange', function () {
+
+        rect.on('shadowChange', function() {
             shadowChanged++;
         });
-        
-        circle.on('radiusChange', function () {
+
+        circle.on('radiusChange', function() {
             radiusChanged++;
         });
-        
+
         circle.setRadius(70, 20);
-        
+
         rect.setSize(210);
         rect.setShadow({
-            offset : {
-                x : 20
+            offset: {
+                x: 20
             }
         });
-        
+
         test(widthChanged === 1, 'width change event was not fired correctly');
         test(shadowChanged === 1, 'shadow change event not fired correctly');
         test(radiusChanged === 1, 'radius change event was not fired correctly');
-        
+
     },
-    'NODE - test setting shadow offset' : function (containerId) {
+    'NODE - test setting shadow offset': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 0,
-                y : 0,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                shadow : {
-                    color : 'blue',
-                    blur : 12
-                }
-            });
-        
+            x: 0,
+            y: 0,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            shadow: {
+                color: 'blue',
+                blur: 12
+            }
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         rect.setShadow({
-            offset : [1, 2]
+            offset: [1, 2]
         });
         test(rect.getShadow().offset.x === 1, 'shadow offset x should be 1');
         test(rect.getShadow().offset.y === 2, 'shadow offset y should be 2');
         // make sure we still have the other properties
         test(rect.getShadow().color === 'blue', 'shadow color should still be blue');
         test(rect.getShadow().blur === 12, 'shadow blur should still be 12');
-        
+
         rect.setShadow({
-            offset : {
-                x : 3,
-                y : 4
+            offset: {
+                x: 3,
+                y: 4
             }
         });
         test(rect.getShadow().offset.x === 3, 'shadow offset x should be 3');
         test(rect.getShadow().offset.y === 4, 'shadow offset y should be 4');
-        
+
         // test partial setting
         rect.setShadow({
-            offset : {
-                x : 5
+            offset: {
+                x: 5
             }
         });
         test(rect.getShadow().offset.x === 5, 'shadow offset x should be 5');
         test(rect.getShadow().offset.y === 4, 'shadow offset y should be 4');
-        
+
         // test partial setting
         rect.setShadow({
-            offset : {
-                y : 6
+            offset: {
+                y: 6
             }
         });
         test(rect.getShadow().offset.x === 5, 'shadow offset x should be 5');
         test(rect.getShadow().offset.y === 6, 'shadow offset y should be 6');
     },
-    'NODE - test setOffset' : function (containerId) {
+    'NODE - test setOffset': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 0,
-                y : 0,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            x: 0,
+            y: 0,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         rect.setOffset(1, 2);
         test(rect.getOffset().x === 1, 'center offset x should be 1');
         test(rect.getOffset().y === 2, 'center offset y should be 2');
-        
+
         rect.setOffset([3, 4]);
         test(rect.getOffset().x === 3, 'center offset x should be 3');
         test(rect.getOffset().y === 4, 'center offset y should be 4');
-        
+
         rect.setOffset({
-            x : 5,
-            y : 6
+            x: 5,
+            y: 6
         });
         test(rect.getOffset().x === 5, 'center offset x should be 5');
         test(rect.getOffset().y === 6, 'center offset y should be 6');
-        
+
         rect.setOffset({
-            x : 7
+            x: 7
         });
         test(rect.getOffset().x === 7, 'center offset x should be 7');
         test(rect.getOffset().y === 6, 'center offset y should be 6');
-        
+
         rect.setOffset({
-            y : 8
+            y: 8
         });
         test(rect.getOffset().x === 7, 'center offset x should be 7');
         test(rect.getOffset().y === 8, 'center offset y should be 8');
-        
+
     },
-    'NODE - test setPosition and move' : function (containerId) {
+    'NODE - test setPosition and move': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 0,
-                y : 0,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            x: 0,
+            y: 0,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         rect.setPosition(1, 2);
         test(rect.getPosition().x === 1, 'rect x should be 1');
         test(rect.getPosition().y === 2, 'rect y should be 2');
-        
+
         rect.setPosition([3, 4]);
         test(rect.getPosition().x === 3, 'rect x should be 3');
         test(rect.getPosition().y === 4, 'rect y should be 4');
-        
+
         rect.setPosition({
-            x : 5,
-            y : 6
+            x: 5,
+            y: 6
         });
         test(rect.getPosition().x === 5, 'rect x should be 5');
         test(rect.getPosition().y === 6, 'rect y should be 6');
-        
+
         rect.setPosition({
-            x : 7
+            x: 7
         });
         test(rect.getPosition().x === 7, 'rect x should be 7');
         test(rect.getPosition().y === 6, 'rect y should be 6');
-        
+
         rect.setPosition({
-            y : 8
+            y: 8
         });
         test(rect.getPosition().x === 7, 'rect x should be 7');
         test(rect.getPosition().y === 8, 'rect y should be 8');
-        
+
         rect.move(10);
         test(rect.getPosition().x === 17, 'rect x should be 17');
         test(rect.getPosition().y === 18, 'rect y should be 18');
-        
+
     },
-    'NODE - test setScale' : function (containerId) {
+    'NODE - test setScale': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         rect.setScale(2, 3);
         test(rect.getScale().x === 2, 'rect scale x should be 2');
         test(rect.getScale().y === 3, 'rect scale x should be 3');
-        
+
         rect.setScale(4);
         test(rect.getScale().x === 4, 'rect scale x should be 4');
         test(rect.getScale().y === 4, 'rect scale x should be 4');
-        
+
         rect.setScale([5, 6]);
         test(rect.getScale().x === 5, 'rect scale x should be 5');
         test(rect.getScale().y === 6, 'rect scale x should be 6');
-        
+
         rect.setScale([7, 8, 999, 999]);
         test(rect.getScale().x === 7, 'rect scale x should be 7');
         test(rect.getScale().y === 8, 'rect scale x should be 8');
-        
+
         rect.setScale({
-            x : 9,
-            y : 10
+            x: 9,
+            y: 10
         });
         test(rect.getScale().x === 9, 'rect scale x should be 9');
         test(rect.getScale().y === 10, 'rect scale x should be 10');
-        
+
         rect.setScale({
-            x : 11
+            x: 11
         });
         test(rect.getScale().x === 11, 'rect scale x should be 11');
         test(rect.getScale().y === 10, 'rect scale x should be 10');
-        
+
         rect.setScale({
-            y : 12
+            y: 12
         });
         test(rect.getScale().x === 11, 'rect scale x should be 11');
         test(rect.getScale().y === 12, 'rect scale x should be 12');
-        
+
     },
-    'NODE - test config scale' : function (containerId) {
+    'NODE - test config scale': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect1 = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                scale : {
-                    x : 2,
-                    y : 3
-                }
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            scale: {
+                x: 2,
+                y: 3
+            }
+        });
+
         var rect2 = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                scale : 2
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            scale: 2
+        });
+
         var rect3 = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                scale : [2, 3]
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            scale: [2, 3]
+        });
+
         var rect4 = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                scale : {
-                    x : 2
-                }
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            scale: {
+                x: 2
+            }
+        });
+
         var rect5 = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                scale : {
-                    y : 2
-                }
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            scale: {
+                y: 2
+            }
+        });
+
         layer.add(rect1).add(rect2).add(rect3).add(rect4).add(rect5);
         stage.add(layer);
-        
+
         test(rect1.getScale().x === 2, 'rect1 scale x should be 2');
         test(rect1.getScale().y === 3, 'rect1 scale y should be 3');
-        
+
         test(rect2.getScale().x === 2, 'rect2 scale x should be 2');
         test(rect2.getScale().y === 2, 'rect2 scale y should be 2');
-        
+
         test(rect3.getScale().x === 2, 'rect3 scale x should be 2');
         test(rect3.getScale().y === 3, 'rect3 scale y should be 3');
-        
+
         test(rect4.getScale().x === 2, 'rect4 scale x should be 2');
         test(rect4.getScale().y === 1, 'rect4 scale y should be 1');
-        
+
         test(rect5.getScale().x === 1, 'rect5 scale x should be 1');
         test(rect5.getScale().y === 2, 'rect5 scale y should be 2');
     },
-    'NODE - test config position' : function (containerId) {
+    'NODE - test config position': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect1 = new Kinetic.Rect({
-                x : 1,
-                y : 2,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            x: 1,
+            y: 2,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         var rect2 = new Kinetic.Rect({
-                x : 3,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            x: 3,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         var rect3 = new Kinetic.Rect({
-                y : 4,
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            y: 4,
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         var rect4 = new Kinetic.Rect({
-                width : 100,
-                height : 50,
-                fill : 'red'
-            });
-        
+            width: 100,
+            height: 50,
+            fill: 'red'
+        });
+
         layer.add(rect1).add(rect2).add(rect3).add(rect4);
         stage.add(layer);
-        
+
         test(rect1.getPosition().x === 1, 'rect1 x should be 1');
         test(rect1.getPosition().y === 2, 'rect1 y should be 2');
-        
+
         test(rect2.getPosition().x === 3, 'rect2 x should be 3');
         test(rect2.getPosition().y === 0, 'rect2 y should be 0');
-        
+
         test(rect3.getPosition().x === 0, 'rect3 x should be 0');
         test(rect3.getPosition().y === 4, 'rect3 y should be 4');
-        
+
         test(rect4.getPosition().x === 0, 'rect4 x should be 0');
         test(rect4.getPosition().y === 0, 'rect4 y should be 0');
     },
-    'NODE - test getPosition and getAbsolutePosition for shape inside transformed stage' : function (containerId) {
+    'NODE - test getPosition and getAbsolutePosition for shape inside transformed stage': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4,
-                draggable : true
-                //rotationDeg: 60
-                //rotationDeg: Math.PI / 3
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4,
+            draggable: true
+            //rotationDeg: 60
+            //rotationDeg: Math.PI / 3
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         //stage.rotateDeg(20);
-        
+
         //console.log(rect.getAbsoluteTransform().getTranslation())
-        
+
         stage.rotate(Math.PI / 3);
         stage.setScale(0.5);
-        
+
         stage.draw();
-        
+
         test(rect.getPosition().x === 200, 'rect position x should be 200');
         test(rect.getPosition().y === 20, 'rect position y should be 20');
-        
+
         test(Math.round(rect.getAbsolutePosition().x) === 41, 'rect absolute position x should be about 41');
         test(Math.round(rect.getAbsolutePosition().y) === 92, 'rect absolute position y should be about 92');
     },
-    'NODE - test getPosition and getAbsolutePosition for transformed parent with center offset' : function (containerId) {
+    'NODE - test getPosition and getAbsolutePosition for transformed parent with center offset': function(containerId) {
         var side = 100;
         var diagonal = Math.sqrt(side * side * 2);
-        
+
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                name : 'stageName',
-                id : 'stageId'
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            name: 'stageName',
+            id: 'stageId'
+        });
         var layer = new Kinetic.Layer({
-                name : 'layerName',
-                id : 'layerId'
-            });
+            name: 'layerName',
+            id: 'layerId'
+        });
         var group = new Kinetic.Group({
-                name : 'groupName',
-                id : 'groupId',
-                rotationDeg : 45,
-                offset : [side / 2, side / 2],
-                x : diagonal / 2,
-                y : diagonal / 2
-            });
+            name: 'groupName',
+            id: 'groupId',
+            rotationDeg: 45,
+            offset: [side / 2, side / 2],
+            x: diagonal / 2,
+            y: diagonal / 2
+        });
         var rect = new Kinetic.Rect({
-                x : 0,
-                y : 0,
-                width : side,
-                height : side,
-                fill : 'red',
-                name : 'rectName',
-                id : 'rectId'
-            });
+            x: 0,
+            y: 0,
+            width: side,
+            height: side,
+            fill: 'red',
+            name: 'rectName',
+            id: 'rectId'
+        });
         var marker = new Kinetic.Rect({
-                x : side,
-                y : 0,
-                width : 1,
-                height : 1,
-                fill : 'blue',
-                stroke : 'blue',
-                strokeWidth : 4,
-                name : 'markerName',
-                id : 'markerId'
-            });
-        
+            x: side,
+            y: 0,
+            width: 1,
+            height: 1,
+            fill: 'blue',
+            stroke: 'blue',
+            strokeWidth: 4,
+            name: 'markerName',
+            id: 'markerId'
+        });
+
         group.add(rect);
         group.add(marker);
         layer.add(group);
         stage.add(layer);
-        
+
         test(Math.round(marker.getAbsolutePosition().x) === Math.round(diagonal), 'marker absolute position x should be about ' + Math.round(diagonal) + ' but is about ' + Math.round(marker.getAbsolutePosition().x));
         test(Math.round(marker.getAbsolutePosition().y) === Math.round(diagonal / 2), 'marker absolute position y should be about ' + Math.round(diagonal / 2) + ' but is about ' + Math.round(marker.getAbsolutePosition().y));
     },
-    'NODE - test get() selector by adding shape, then group, then layer' : function (containerId) {
+    'NODE - test get() selector by adding shape, then group, then layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                name : 'stageName',
-                id : 'stageId'
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            name: 'stageName',
+            id: 'stageId'
+        });
         var layer = new Kinetic.Layer({
-                name : 'layerName',
-                id : 'layerId'
-            });
+            name: 'layerName',
+            id: 'layerId'
+        });
         var group = new Kinetic.Group({
-                name : 'groupName',
-                id : 'groupId'
-            });
+            name: 'groupName',
+            id: 'groupId'
+        });
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'rectName',
-                id : 'rectId'
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'rectName',
+            id: 'rectId'
+        });
+
         group.add(rect);
         layer.add(group);
         stage.add(layer);
-        
+
         test(stage.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(stage.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(layer.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(layer.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(group.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(group.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
-        
+
         test(stage.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(stage.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
         test(layer.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(layer.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
-        
+
         test(stage.get('.layerName')[0].attrs.id === 'layerId', 'problem with layer name selector');
         test(stage.get('#layerId')[0].attrs.id === 'layerId', 'problem with layer id selector');
     },
-    'NODE - test get() selector by adding group, then shape, then layer' : function (containerId) {
+    'NODE - test get() selector by adding group, then shape, then layer': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                name : 'stageName',
-                id : 'stageId'
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            name: 'stageName',
+            id: 'stageId'
+        });
         var layer = new Kinetic.Layer({
-                name : 'layerName',
-                id : 'layerId'
-            });
+            name: 'layerName',
+            id: 'layerId'
+        });
         var group = new Kinetic.Group({
-                name : 'groupName',
-                id : 'groupId'
-            });
+            name: 'groupName',
+            id: 'groupId'
+        });
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'rectName',
-                id : 'rectId'
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'rectName',
+            id: 'rectId'
+        });
+
         layer.add(group);
         group.add(rect);
         stage.add(layer);
-        
+
         test(stage.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(stage.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(layer.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(layer.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(group.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(group.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
-        
+
         test(stage.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(stage.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
         test(layer.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(layer.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
-        
+
         test(stage.get('.layerName')[0].attrs.id === 'layerId', 'problem with layer name selector');
         test(stage.get('#layerId')[0].attrs.id === 'layerId', 'problem with layer id selector');
     },
-    'NODE - test get() selector by adding group, then layer, then shape' : function (containerId) {
+    'NODE - test get() selector by adding group, then layer, then shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                name : 'stageName',
-                id : 'stageId'
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            name: 'stageName',
+            id: 'stageId'
+        });
         var layer = new Kinetic.Layer({
-                name : 'layerName',
-                id : 'layerId'
-            });
+            name: 'layerName',
+            id: 'layerId'
+        });
         var group = new Kinetic.Group({
-                name : 'groupName',
-                id : 'groupId'
-            });
+            name: 'groupName',
+            id: 'groupId'
+        });
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'rectName',
-                id : 'rectId'
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'rectName',
+            id: 'rectId'
+        });
+
         layer.add(group);
         stage.add(layer);
         group.add(rect);
-        
+
         test(stage.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(stage.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(layer.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(layer.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(group.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(group.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
-        
+
         test(stage.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(stage.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
         test(layer.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(layer.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
-        
+
         test(stage.get('.layerName')[0].attrs.id === 'layerId', 'problem with layer name selector');
         test(stage.get('#layerId')[0].attrs.id === 'layerId', 'problem with layer id selector');
     },
-    'NODE - test get() selector by adding layer, then group, then shape' : function (containerId) {
+    'NODE - test get() selector by adding layer, then group, then shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200,
-                name : 'stageName',
-                id : 'stageId'
-            });
+            container: containerId,
+            width: 578,
+            height: 200,
+            name: 'stageName',
+            id: 'stageId'
+        });
         var layer = new Kinetic.Layer({
-                name : 'layerName',
-                id : 'layerId'
-            });
+            name: 'layerName',
+            id: 'layerId'
+        });
         var group = new Kinetic.Group({
-                name : 'groupName',
-                id : 'groupId'
-            });
+            name: 'groupName',
+            id: 'groupId'
+        });
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 20,
-                width : 100,
-                height : 50,
-                fill : 'red',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'rectName',
-                id : 'rectId'
-            });
-        
+            x: 200,
+            y: 20,
+            width: 100,
+            height: 50,
+            fill: 'red',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'rectName',
+            id: 'rectId'
+        });
+
         stage.add(layer);
         layer.add(group);
         group.add(rect);
-        
+
         test(stage.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(stage.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(layer.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(layer.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
         test(group.get('.rectName')[0].attrs.id === 'rectId', 'problem with shape name selector');
         test(group.get('#rectId')[0].attrs.id === 'rectId', 'problem with shape id selector');
-        
+
         test(stage.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(stage.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
         test(layer.get('.groupName')[0].attrs.id === 'groupId', 'problem with group name selector');
         test(layer.get('#groupId')[0].attrs.id === 'groupId', 'problem with group id selector');
-        
+
         test(stage.get('.layerName')[0].attrs.id === 'layerId', 'problem with layer name selector');
         test(stage.get('#layerId')[0].attrs.id === 'layerId', 'problem with layer id selector');
-        
+
         layer.draw();
     },
-    'NODE - test drag and drop properties and methods' : function (containerId) {
+    'NODE - test drag and drop properties and methods': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         stage.add(layer);
         layer.add(circle);
         layer.draw();
-        
+
         // test defaults
         test(circle.attrs.draggable === false, 'draggable should be false');
         test(circle.attrs.dragConstraint === 'none', 'drag constraint should be none');
@@ -3761,17 +3755,17 @@ Test.prototype.tests = {
         test(circle.attrs.dragBounds.bottom === undefined, 'drag bottom should be undefined');
         test(circle.getDragConstraint() === 'none', 'drag constraint should be none');
         test(circle.getDragBounds().bottom === undefined, 'drag bottom should be undefined');
-        
+
         //change properties
         circle.setDraggable(true);
         circle.setDragConstraint('vertical');
         circle.setDragBounds({
-            left : 50,
-            top : 100,
-            right : 150,
-            bottom : 200
+            left: 50,
+            top: 100,
+            right: 150,
+            bottom: 200
         });
-        
+
         // test new properties
         test(circle.attrs.draggable === true, 'draggable should be true');
         test(circle.attrs.dragConstraint === 'vertical', 'drag constraint should be vertical');
@@ -3782,372 +3776,377 @@ Test.prototype.tests = {
         test(circle.getDragConstraint() === 'vertical', 'drag constraint should be vertical');
         test(circle.getDragBounds().bottom === 200, 'drag bottom should be 200');
     },
-    'NODE - translate, rotate, scale shape' : function (containerId) {
+    'NODE - translate, rotate, scale shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Rect({
-                x : 100,
-                y : 100,
-                rotationDeg : 20,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                scale : {
-                    x : 2,
-                    y : 1
-                },
-                offset : {
-                    x : 50,
-                    y : 25
-                }
-            });
-        
+            x: 100,
+            y: 100,
+            rotationDeg: 20,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            scale: {
+                x: 2,
+                y: 1
+            },
+            offset: {
+                x: 50,
+                y: 25
+            }
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
-        stage.onFrame(function (frame) {
+
+        stage.onFrame(function(frame) {
             circle.rotation += 0.1;
             layer.draw();
         });
         //stage.start();
-        
+
     },
-    'NODE - simulate event' : function (containerId) {
+    'NODE - simulate event': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         stage.add(layer);
         layer.add(circle);
         layer.draw();
-        
+
         var foo = '';
-        
-        circle.on('click', function () {
+
+        circle.on('click', function() {
             foo = 'bar';
-            
+
             /*
-            var evt = window.event;
-            var rightClick = evt.which ? evt.which == 3 : evt.button == 2;
-            console.log(rightClick);
+             var evt = window.event;
+             var rightClick = evt.which ? evt.which == 3 : evt.button == 2;
+             console.log(rightClick);
              */
         });
-        
+
         circle.simulate('click');
-        
+
         test(foo === 'bar', 'foo should equal bar');
     },
-    'EVENTS - add remove event' : function (containerId) {
+    'EVENTS - add remove event': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         /*
          * test regular on and off
          */
         test(circle.eventListeners['click'] === undefined, 'circle should have no click listeners');
-        
-        circle.on('click', function () {});
+
+        circle.on('click', function() {
+        });
         test(circle.eventListeners['click'].length === 1, 'circle should have 1 click listener');
-        
-        circle.on('click', function () {});
+
+        circle.on('click', function() {
+        });
         test(circle.eventListeners['click'].length === 2, 'circle should have 2 click listeners');
-        
+
         circle.off('click');
         test(circle.eventListeners['click'] === undefined, 'circle should have no click listeners');
-        
+
         /*
          * test name spacing
          */
-        circle.on('click.foo', function () {});
+        circle.on('click.foo', function() {
+        });
         test(circle.eventListeners['click'].length === 1, 'circle should have 1 click listener');
-        
-        circle.on('click.foo', function () {});
+
+        circle.on('click.foo', function() {
+        });
         test(circle.eventListeners['click'].length === 2, 'circle should have 2 click listeners');
-        circle.on('click.bar', function () {});
+        circle.on('click.bar', function() {
+        });
         test(circle.eventListeners['click'].length === 3, 'circle should have 3 click listeners');
-        
+
         circle.off('click.foo');
         test(circle.eventListeners['click'].length === 1, 'circle should have 1 click listener');
-        
+
         circle.off('click.bar');
         test(circle.eventListeners['click'] === undefined, 'circle should have no click listeners');
-        
+
         stage.add(layer);
         layer.add(circle);
         layer.draw();
     },
-    'NODE - simulate event bubble' : function (containerId) {
+    'NODE - simulate event bubble': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         stage.add(layer);
         layer.add(circle);
         layer.draw();
-        
+
         var clicks = [];
-        
-        circle.on('click', function () {
+
+        circle.on('click', function() {
             clicks.push('circle');
         });
-        
-        layer.on('click', function () {
+
+        layer.on('click', function() {
             clicks.push('layer');
         });
-        
+
         circle.simulate('click');
-        
+
         test(clicks[0] === 'circle', 'circle event should be fired first');
         test(clicks[1] === 'layer', 'layer event should be fired second');
     },
-    'STAGE - add layer then shape' : function (containerId) {
+    'STAGE - add layer then shape': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                name : 'myCircle'
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            name: 'myCircle'
+        });
+
         stage.add(layer);
         layer.add(circle);
         layer.draw();
     },
-    'TRANSFORMS - move shape, group, and layer, and then get absolute position' : function (containerId) {
+    'TRANSFORMS - move shape, group, and layer, and then get absolute position': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
+
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         group.add(circle);
         layer.add(group);
         stage.add(layer);
-        
+
         circle.setPosition(100, 0);
         group.setPosition(100, 0);
         layer.setPosition(100, 0);
-        
+
         // test relative positions
         test(circle.getPosition().x == 100, 'circle should be at x = 100');
         test(group.getPosition().x == 100, 'group should be at x = 100');
         test(layer.getPosition().x == 100, 'layer should be at x = 100');
-        
+
         // test absolute positions
         test(circle.getAbsolutePosition().x == 300, 'circle should be at x = 300');
         test(group.getAbsolutePosition().x == 200, 'group should be at x = 200');
         test(layer.getAbsolutePosition().x == 100, 'layer should be at x = 100');
-        
+
         layer.draw();
     },
-    'TRANSFORMS - scale layer, rotate group, position shape, and then get absolute position' : function (containerId) {
+    'TRANSFORMS - scale layer, rotate group, position shape, and then get absolute position': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer({
-                scale : {
-                    x : 2,
-                    y : 2
-                }
-            });
+            scale: {
+                x: 2,
+                y: 2
+            }
+        });
         var group = new Kinetic.Group({
-                x : 100,
-                rotationDeg : 90
-            });
-        
+            x: 100,
+            rotationDeg: 90
+        });
+
         var rect = new Kinetic.Rect({
-                x : 50,
-                y : 10,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4,
-                draggable : true
-            });
-        
+            x: 50,
+            y: 10,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4,
+            draggable: true
+        });
+
         group.add(rect);
         layer.add(group);
         stage.add(layer);
-        
+
         // test absolute positions
         test(rect.getAbsolutePosition().x == 180, 'rect should be at x = 180');
         test(rect.getAbsolutePosition().y == 100, 'rect should be at y = 100');
-        
+
         layer.draw();
     },
-    'SHAPE - hide show circle' : function (containerId) {
+    'SHAPE - hide show circle': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(circle);
         stage.add(layer);
-        
+
         test(circle.isVisible() === true, 'circle should be visible');
-        
+
         circle.hide();
         layer.draw();
-        
+
         test(circle.isVisible() === false, 'circle should be hidden');
-        
+
         circle.show();
         layer.draw();
-        
+
         test(circle.isVisible() === true, 'circle should be visible');
     },
-    'SHAPE - set shape alpha to 0.5' : function (containerId) {
+    'SHAPE - set shape alpha to 0.5': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         circle.setAlpha(0.5);
         layer.add(circle);
         stage.add(layer);
     },
-    'SHAPE - set shape alpha to 0.5 then back to 1' : function (containerId) {
+    'SHAPE - set shape alpha to 0.5 then back to 1': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : stage.getWidth() / 2,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: stage.getWidth() / 2,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         circle.setAlpha(0.5);
         layer.add(circle);
         stage.add(layer);
-        
+
         test(circle.getAbsoluteAlpha() === 0.5, 'abs alpha should be 0.5');
-        
+
         circle.setAlpha(1);
         layer.draw();
-        
+
         test(circle.getAbsoluteAlpha() === 1, 'abs alpha should be 1');
     },
     ////////////////////////////////////////////////////////////////////////
     //  LAYERING tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'LAYERING - get absolute z index' : function (containerId) {
+
+    'LAYERING - get absolute z index': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var group1 = new Kinetic.Group();
         var group2 = new Kinetic.Group();
         var group3 = new Kinetic.Group();
         var group4 = new Kinetic.Group();
-        
+
         var shape1 = new Kinetic.Ellipse({
-                x : 150,
-                y : stage.getHeight() / 2,
-                radius : 40,
-                fill : 'green'
-            });
-        
+            x: 150,
+            y: stage.getHeight() / 2,
+            radius: 40,
+            fill: 'green'
+        });
+
         var shape2 = new Kinetic.Ellipse({
-                x : 250,
-                y : stage.getHeight() / 2,
-                radius : 40,
-                fill : 'green'
-            });
-        
+            x: 250,
+            y: stage.getHeight() / 2,
+            radius: 40,
+            fill: 'green'
+        });
+
         /*
          *        Stage(0)
          *          |
@@ -4165,7 +4164,7 @@ Test.prototype.tests = {
          *            |
          *           S2(7)
          */
-        
+
         group1.add(shape1);
         group2.add(group3);
         group2.add(group4);
@@ -4173,7 +4172,7 @@ Test.prototype.tests = {
         layer.add(group1);
         layer.add(group2);
         stage.add(layer);
-        
+
         test(stage.getAbsoluteZIndex() === 0, 'stage abs zindex should be 0');
         test(layer.getAbsoluteZIndex() === 1, 'layer abs zindex should be 1');
         test(group1.getAbsoluteZIndex() === 2, 'group1 abs zindex should be 2');
@@ -4183,1324 +4182,1332 @@ Test.prototype.tests = {
         test(group4.getAbsoluteZIndex() === 6, 'group4 abs zindex should be 6');
         test(shape2.getAbsoluteZIndex() === 7, 'shape2 abs zindex should be 7');
     },
-    'LAYERING - move blue circle on top of green circle with moveToTop' : function (containerId) {
+    'LAYERING - move blue circle on top of green circle with moveToTop': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(bluecircle);
         layer.add(greencircle);
         stage.add(layer);
-        
+
         test(bluecircle.getZIndex() === 0, 'blue circle should have zindex 0 before relayering');
         test(greencircle.getZIndex() === 1, 'green circle should have zindex 1 before relayering');
-        
+
         bluecircle.moveToTop();
-        
+
         test(bluecircle.getZIndex() === 1, 'blue circle should have zindex 1 after relayering');
         test(greencircle.getZIndex() === 0, 'green circle should have zindex 0 after relayering');
-        
+
         layer.draw();
     },
-    'LAYERING - move green circle below blue circle with moveDown' : function (containerId) {
+    'LAYERING - move green circle below blue circle with moveDown': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(bluecircle);
         layer.add(greencircle);
         stage.add(layer);
-        
+
         test(bluecircle.getZIndex() === 0, 'blue circle should have zindex 0 before relayering');
         test(greencircle.getZIndex() === 1, 'green circle should have zindex 1 before relayering');
-        
+
         greencircle.moveDown();
-        
+
         test(bluecircle.getZIndex() === 1, 'blue circle should have zindex 1 after relayering');
         test(greencircle.getZIndex() === 0, 'green circle should have zindex 0 after relayering');
-        
+
         layer.draw();
     },
-    'LAYERING - move blue group on top of green group with moveToTop' : function (containerId) {
+    'LAYERING - move blue group on top of green group with moveToTop': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var greenGroup = new Kinetic.Group();
         var blueGroup = new Kinetic.Group();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         blueGroup.add(bluecircle);
         greenGroup.add(greencircle);
-        
+
         layer.add(blueGroup);
         layer.add(greenGroup);
         stage.add(layer);
-        
+
         test(blueGroup.getZIndex() === 0, 'blue group should have zindex 0 before relayering');
         test(greenGroup.getZIndex() === 1, 'green group should have zindex 1 before relayering');
-        
+
         blueGroup.moveToTop();
-        
+
         test(blueGroup.getZIndex() === 1, 'blue group should have zindex 1 after relayering');
         test(greenGroup.getZIndex() === 0, 'green group should have zindex 0 after relayering');
-        
+
         layer.draw();
     },
-    'LAYERING - move blue group on top of green group with moveUp' : function (containerId) {
+    'LAYERING - move blue group on top of green group with moveUp': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var greenGroup = new Kinetic.Group();
         var blueGroup = new Kinetic.Group();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         blueGroup.add(bluecircle);
         greenGroup.add(greencircle);
-        
+
         layer.add(blueGroup);
         layer.add(greenGroup);
         stage.add(layer);
-        
+
         test(blueGroup.getZIndex() === 0, 'blue group should have zindex 0 before relayering');
         test(greenGroup.getZIndex() === 1, 'green group should have zindex 1 before relayering');
-        
+
         blueGroup.moveUp();
-        
+
         test(blueGroup.getZIndex() === 1, 'blue group should have zindex 1 after relayering');
         test(greenGroup.getZIndex() === 0, 'green group should have zindex 0 after relayering');
-        
+
         layer.draw();
     },
-    'LAYERING - move blue layer on top of green layer with moveToTop' : function (containerId) {
+    'LAYERING - move blue layer on top of green layer with moveToTop': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var blueLayer = new Kinetic.Layer();
         var greenLayer = new Kinetic.Layer();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         blueLayer.add(bluecircle);
         greenLayer.add(greencircle);
-        
+
         stage.add(blueLayer);
         stage.add(greenLayer);
-        
+
         blueLayer.moveToTop();
     },
-    'LAYERING - move green layer below blue layer with moveToBottom' : function (containerId) {
+    'LAYERING - move green layer below blue layer with moveToBottom': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var blueLayer = new Kinetic.Layer();
         var greenLayer = new Kinetic.Layer();
-        
+
         var bluecircle = new Kinetic.Ellipse({
-                x : 200,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'blue',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'blue',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         var greencircle = new Kinetic.Ellipse({
-                x : 280,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 280,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         blueLayer.add(bluecircle);
         greenLayer.add(greencircle);
-        
+
         stage.add(blueLayer);
         stage.add(greenLayer);
-        
+
         greenLayer.moveToBottom();
     },
     ////////////////////////////////////////////////////////////////////////
     //  ANIMATION tests
     ////////////////////////////////////////////////////////////////////////
-    
+
     /*
      * WARNING: make sure that this is the first unit test that uses
      * animation because it's accessing the global animation object which could
      * be modified by other unit tests
      */
-    'ANIMATION - test start and stop' : function (containerId) {
+    'ANIMATION - test start and stop': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 200,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 200,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         var amplitude = 150;
         var period = 1000;
         // in ms
         var centerX = stage.getWidth() / 2 - 100 / 2;
-        
-        stage.onFrame(function (frame) {
+
+        stage.onFrame(function(frame) {
             rect.setX(amplitude * Math.sin(frame.time * 2 * Math.PI / period) + centerX);
             layer.draw();
         });
         var a = Kinetic.Animation;
-        
+
         test(a.animations.length === 0, 'should be no animations running');
         test(stage.animRunning === false, 'animRunning should be false');
-        
+
         stage.start();
-        
+
         test(a.animations.length === 1, 'should be 1 animation running');
         test(stage.animRunning === true, 'animRunning should be true');
-        
+
         stage.start();
-        
+
         test(a.animations.length === 1, 'should be 1 animation running');
         test(stage.animRunning === true, 'animRunning should be true');
-        
+
         stage.stop();
-        
+
         test(a.animations.length === 0, 'should be no animations running');
         test(stage.animRunning === false, 'animRunning should be false');
-        
+
         stage.stop();
-        
+
         test(a.animations.length === 0, 'should be no animations running');
         test(stage.animRunning === false, 'animRunning should be false');
     },
     ////////////////////////////////////////////////////////////////////////
     //  TRANSITION tests
     ////////////////////////////////////////////////////////////////////////
-    
-    'TRANSITION - start animation when transition completes' : function (containerId) {
+
+    'TRANSITION - start animation when transition completes': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 0,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 0,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         var amplitude = 150;
         var period = 1000;
         var centerX = 0;
-        
-        stage.onFrame(function (frame) {
+
+        stage.onFrame(function(frame) {
             rect.setX(amplitude * Math.sin(frame.time * 2 * Math.PI / period) + centerX);
             layer.draw();
         });
-        
+
         stage.start();
         stage.stop();
         centerX = 300;
-        
+
         var go = Kinetic.Global;
-        
+
         rect.transitionTo({
-            x : 300,
-            duration : 1,
-            callback : function () {
+            x: 300,
+            duration: 1,
+            callback: function() {
                 test(rect.getX() === 300, 'rect x is not 300');
                 stage.start();
             }
         });
     },
-    'TRANSITION - stop and resume transition' : function (containerId) {
+    'TRANSITION - stop and resume transition': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var rect = new Kinetic.Rect({
-                x : 100,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
+            x: 100,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
         layer.add(rect);
         stage.add(layer);
-        
+
         var transFinished = false;
-        
+
         var trans = rect.transitionTo({
-                duration : 0.2,
-                x : 400,
-                y : 30,
-                rotation : Math.PI * 2,
-                easing : 'bounce-ease-out',
-                callback : function () {
-                    transFinished = true;
-                }
-            });
-        
-        setTimeout(function () {
+            duration: 0.2,
+            x: 400,
+            y: 30,
+            rotation: Math.PI * 2,
+            easing: 'bounce-ease-out',
+            callback: function() {
+                transFinished = true;
+            }
+        });
+
+        setTimeout(function() {
             trans.stop();
         }, 100);
-        setTimeout(function () {
+        setTimeout(function() {
             trans.resume();
         }, 100);
     },
-    'TRANSITION - transition stage' : function (containerId) {
+    'TRANSITION - transition stage': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        var layer = new Kinetic.Layer();
-        var rect = new Kinetic.Rect({
-                x : 100,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
-        layer.add(rect);
-        stage.add(layer);
-        
-        var trans = stage.transitionTo({
-                duration : 1,
-                x : 400,
-                y : 30,
-                rotation : Math.PI * 2,
-                easing : 'bounce-ease-out',
-                callback : function () {
-                    test(stage.getX() === 400, 'stage x should be 400');
-                    test(stage.getY() === 30, 'stage y should be 30');
-                    test(stage.getRotation() == Math.PI * 2, 'stage rotation should be Math.PI * 2');
-                }
-            });
-    },
-    'TRANSITION - overwrite active transition with new transition' : function (containerId) {
-        var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
-        var layer = new Kinetic.Layer();
-        var rect = new Kinetic.Rect({
-                x : 100,
-                y : 100,
-                width : 100,
-                height : 50,
-                fill : 'green',
-                stroke : 'black',
-                strokeWidth : 4
-            });
-        
-        layer.add(rect);
-        stage.add(layer);
-        
-        rect.transitionTo({
-            x : 400,
-            y : 30,
-            duration : 500
+            container: containerId,
+            width: 578,
+            height: 200
         });
-        
+        var layer = new Kinetic.Layer();
+        var rect = new Kinetic.Rect({
+            x: 100,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
+        layer.add(rect);
+        stage.add(layer);
+
+        var trans = stage.transitionTo({
+            duration: 1,
+            x: 400,
+            y: 30,
+            rotation: Math.PI * 2,
+            easing: 'bounce-ease-out',
+            callback: function() {
+                test(stage.getX() === 400, 'stage x should be 400');
+                test(stage.getY() === 30, 'stage y should be 30');
+                test(stage.getRotation() == Math.PI * 2, 'stage rotation should be Math.PI * 2');
+            }
+        });
+    },
+    'TRANSITION - overwrite active transition with new transition': function(containerId) {
+        var stage = new Kinetic.Stage({
+            container: containerId,
+            width: 578,
+            height: 200
+        });
+        var layer = new Kinetic.Layer();
+        var rect = new Kinetic.Rect({
+            x: 100,
+            y: 100,
+            width: 100,
+            height: 50,
+            fill: 'green',
+            stroke: 'black',
+            strokeWidth: 4
+        });
+
+        layer.add(rect);
+        stage.add(layer);
+
         rect.transitionTo({
-            rotation : Math.PI * 2,
-            duration : 1,
-            callback : function () {
+            x: 400,
+            y: 30,
+            duration: 500
+        });
+
+        rect.transitionTo({
+            rotation: Math.PI * 2,
+            duration: 1,
+            callback: function() {
                 /*
                  * TODO: this method fails every now and then, seemingly
                  * from a race condition.  need to investigate
                  */
                 /*
-                test(rect.getX() === 100, 'rect x should be 100');
-                test(rect.getY() === 100, 'rect y should be 100');
-                test(rect.getRotation() == Math.PI * 2, 'rect x should be Math.PI * 2');
+                 test(rect.getX() === 100, 'rect x should be 100');
+                 test(rect.getY() === 100, 'rect y should be 100');
+                 test(rect.getRotation() == Math.PI * 2, 'rect x should be Math.PI * 2');
                  */
             }
         });
     },
-    'DRAG AND DROP - multiple drag and drop sets with setDraggable()' : function (containerId) {
+    'DRAG AND DROP - multiple drag and drop sets with setDraggable()': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 578,
-                height : 200
-            });
+            container: containerId,
+            width: 578,
+            height: 200
+        });
         var layer = new Kinetic.Layer();
         var circle = new Kinetic.Ellipse({
-                x : 380,
-                y : stage.getHeight() / 2,
-                radius : 70,
-                strokeWidth : 4,
-                fill : 'red',
-                stroke : 'black'
-            });
-        
+            x: 380,
+            y: stage.getHeight() / 2,
+            radius: 70,
+            strokeWidth: 4,
+            fill: 'red',
+            stroke: 'black'
+        });
+
         circle.setDraggable(true);
         test(circle.getDraggable(), 'draggable should be true');
         circle.setDraggable(true);
         test(circle.getDraggable(), 'draggable should be true');
         circle.setDraggable(false);
         test(!circle.getDraggable(), 'draggable should be false');
-        
+
         layer.add(circle);
         stage.add(layer);
-        
+
     },
-	
-	////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////////////////////////////////////////////
     //  Kinetic.Plugins tests
     ////////////////////////////////////////////////////////////////////////
-	
-	
-    'PATH - add simple path' : function (containerId) {
+
+    'PATH - add simple path': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var path = new Kinetic.Plugins.Path({
-                data : 'M200,100h100v50z',
-                fill : '#ccc',
-                stroke : '#333',
-                strokeWidth : 2,
-                shadow : {
-                    color : 'black',
-                    blur : 2,
-                    offset : [10, 10],
-                    alpha : 0.5
-                },
-                draggable : true
-            });
-        
-        path.on('mouseover', function () {
+            data: 'M200,100h100v50z',
+            fill: '#ccc',
+            stroke: '#333',
+            strokeWidth: 2,
+            shadow: {
+                color: 'black',
+                blur: 2,
+                offset: [10, 10],
+                alpha: 0.5
+            },
+            draggable: true
+        });
+
+        path.on('mouseover', function() {
             this.setFill('red');
             layer.draw();
         });
-        
-        path.on('mouseout', function () {
+
+        path.on('mouseout', function() {
             this.setFill('#ccc');
             layer.draw();
         });
-        
+
         layer.add(path);
-        
+
         stage.add(layer);
-        
+
         test(path.getData() === 'M200,100h100v50z', 'data are incorrect');
         test(path.dataArray.length === 4, 'data array should have 4 elements');
-        
+
         path.setData('M200');
-        
+
         test(path.getData() === 'M200', 'data are incorrect');
         test(path.dataArray.length === 1, 'data array should have 1 element');
-        
+
         path.setData('M200,100h100v50z');
-        
+
     },
-    'PATH - moveTo with implied lineTos and trailing comma' : function (containerId) {
+    'PATH - moveTo with implied lineTos and trailing comma': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var path = new Kinetic.Plugins.Path({
-                data : 'm200,100,100,0,0,50,z',
-                fill : '#fcc',
-                stroke : '#333',
-                strokeWidth : 2,
-                shadow : {
-                    color : 'maroon',
-                    blur : 2,
-                    offset : [10, 10],
-                    alpha : 0.5
-                },
-                draggable : true
-            });
-        
-        path.on('mouseover', function () {
+            data: 'm200,100,100,0,0,50,z',
+            fill: '#fcc',
+            stroke: '#333',
+            strokeWidth: 2,
+            shadow: {
+                color: 'maroon',
+                blur: 2,
+                offset: [10, 10],
+                alpha: 0.5
+            },
+            draggable: true
+        });
+
+        path.on('mouseover', function() {
             this.setFill('red');
             layer.draw();
         });
-        
-        path.on('mouseout', function () {
+
+        path.on('mouseout', function() {
             this.setFill('#ccc');
             layer.draw();
         });
-        
+
         layer.add(path);
-        
+
         stage.add(layer);
-        
+
         test(path.getData() === 'm200,100,100,0,0,50,z', 'data are incorrect');
         test(path.dataArray.length === 4, 'data array should have 4 elements');
-        
+
         test(path.dataArray[1].command === 'L', 'second command should be an implied lineTo');
     },
-    'PATH - add map path' : function (containerId) {
+    'PATH - add map path': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var mapLayer = new Kinetic.Layer();
-        
-        for (var key in worldMap.shapes) {
+
+        for(var key in worldMap.shapes) {
             var c = worldMap.shapes[key];
-            
+
             var path = new Kinetic.Plugins.Path({
-                    data : c,
-                    fill : '#ccc',
-                    stroke : '#999',
-                    strokeWidth : 1
-                });
-            
-            if (key === 'US')
+                data: c,
+                fill: '#ccc',
+                stroke: '#999',
+                strokeWidth: 1
+            });
+
+            if(key === 'US')
                 test(path.dataArray[0].command === 'M', 'first command should be a moveTo');
-            
-            path.on('mouseover', function () {
+
+            path.on('mouseover', function() {
                 this.setFill('red');
                 mapLayer.draw();
             });
-            
-            path.on('mouseout', function () {
+
+            path.on('mouseout', function() {
                 this.setFill('#ccc');
                 mapLayer.draw();
             });
-            
+
             mapLayer.add(path);
         }
-        
+
         stage.add(mapLayer);
     },
-    'PATH - curved arrow path' : function (containerId) {
+    'PATH - curved arrow path': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M12.582,9.551C3.251,16.237,0.921,29.021,7.08,38.564l-2.36,1.689l4.893,2.262l4.893,2.262l-0.568-5.36l-0.567-5.359l-2.365,1.694c-4.657-7.375-2.83-17.185,4.352-22.33c7.451-5.338,17.817-3.625,23.156,3.824c5.337,7.449,3.625,17.813-3.821,23.152l2.857,3.988c9.617-6.893,11.827-20.277,4.935-29.896C35.591,4.87,22.204,2.658,12.582,9.551z";
-        
+
         var path = new Kinetic.Plugins.Path({
-                data : c,
-                fill : '#ccc',
-                stroke : '#999',
-                strokeWidth : 1
-            });
-        
-        path.on('mouseover', function () {
+            data: c,
+            fill: '#ccc',
+            stroke: '#999',
+            strokeWidth: 1
+        });
+
+        path.on('mouseover', function() {
             this.setFill('red');
             layer.draw();
         });
-        
-        path.on('mouseout', function () {
+
+        path.on('mouseout', function() {
             this.setFill('#ccc');
             layer.draw();
         });
-        
+
         layer.add(path);
         stage.add(layer);
-        
+
     },
-    'PATH - Quadradic Curve test from SVG w3c spec' : function (containerId) {
+    'PATH - Quadradic Curve test from SVG w3c spec': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.25,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.25,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M200,300 Q400,50 600,300 T1000,300";
-        
+
         var path = new Kinetic.Plugins.Path({
-                data : c,
-                stroke : 'red',
-                strokeWidth : 5
-            });
-        
+            data: c,
+            stroke: 'red',
+            strokeWidth: 5
+        });
+
         layer.add(path);
-        
+
         layer.add(new Kinetic.Ellipse({
-                x : 200,
-                y : 300,
-                radius : 10,
-                fill : 'black'
-            }));
-        
+            x: 200,
+            y: 300,
+            radius: 10,
+            fill: 'black'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 600,
-                y : 300,
-                radius : 10,
-                fill : 'black'
-            }));
-        
+            x: 600,
+            y: 300,
+            radius: 10,
+            fill: 'black'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 1000,
-                y : 300,
-                radius : 10,
-                fill : 'black'
-            }));
-        
+            x: 1000,
+            y: 300,
+            radius: 10,
+            fill: 'black'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 400,
-                y : 50,
-                radius : 10,
-                fill : '#888'
-            }));
-        
+            x: 400,
+            y: 50,
+            radius: 10,
+            fill: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 800,
-                y : 550,
-                radius : 10,
-                fill : '#888'
-            }));
-        
+            x: 800,
+            y: 550,
+            radius: 10,
+            fill: '#888'
+        }));
+
         layer.add(new Kinetic.Plugins.Path({
-                data : "M200,300 L400,50L600,300L800,550L1000,300",
-                stroke : "#888",
-                strokeWidth : 2
-            }));
-        
+            data: "M200,300 L400,50L600,300L800,550L1000,300",
+            stroke: "#888",
+            strokeWidth: 2
+        }));
+
         stage.add(layer);
-        
+
     },
-    'PATH - Cubic Bezier Curve test from SVG w3c spec using setData' : function (containerId) {
+    'PATH - Cubic Bezier Curve test from SVG w3c spec using setData': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M100,200 C100,100 250,100 250,200 S400,300 400,200";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 5
-            });
-        
+            stroke: 'red',
+            strokeWidth: 5
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
+
         layer.add(new Kinetic.Ellipse({
-                x : 100,
-                y : 200,
-                radius : 10,
-                stroke : '#888'
-            }));
-        
+            x: 100,
+            y: 200,
+            radius: 10,
+            stroke: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 250,
-                y : 200,
-                radius : 10,
-                stroke : '#888'
-            }));
-        
+            x: 250,
+            y: 200,
+            radius: 10,
+            stroke: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 400,
-                y : 200,
-                radius : 10,
-                stroke : '#888'
-            }));
-        
+            x: 400,
+            y: 200,
+            radius: 10,
+            stroke: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 100,
-                y : 100,
-                radius : 10,
-                fill : '#888'
-            }));
-        
+            x: 100,
+            y: 100,
+            radius: 10,
+            fill: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 250,
-                y : 100,
-                radius : 10,
-                fill : '#888'
-            }));
-        
+            x: 250,
+            y: 100,
+            radius: 10,
+            fill: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 400,
-                y : 300,
-                radius : 10,
-                fill : '#888'
-            }));
-        
+            x: 400,
+            y: 300,
+            radius: 10,
+            fill: '#888'
+        }));
+
         layer.add(new Kinetic.Ellipse({
-                x : 250,
-                y : 300,
-                radius : 10,
-                stroke : 'blue'
-            }));
-        
+            x: 250,
+            y: 300,
+            radius: 10,
+            stroke: 'blue'
+        }));
+
         stage.add(layer);
-        
+
     },
-    'PATH - arc' : function (containerId) {
+    'PATH - arc': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M100,350 l 50,-25 a25,25 -30 0,1 50,-25 l 50,-25 a25,50 -30 0,1 50,-25 l 50,-25 a25,75 -30 0,1 50,-25 l 50,-25 a25,100 -30 0,1 50,-25 l 50,-25";
-        
+
         var path = new Kinetic.Plugins.Path({
-                data : c,
-                fill : 'none',
-                stroke : '#999',
-                strokeWidth : 1
-            });
-        
-        path.on('mouseover', function () {
+            data: c,
+            fill: 'none',
+            stroke: '#999',
+            strokeWidth: 1
+        });
+
+        path.on('mouseover', function() {
             this.setFill('red');
             layer.draw();
         });
-        
-        path.on('mouseout', function () {
+
+        path.on('mouseout', function() {
             this.setFill('none');
             layer.draw();
         });
-        
+
         layer.add(path);
         stage.add(layer);
-        
+
     },
-    'PATH - Tiger (RAWR!)' : function (containerId) {
+    'PATH - Tiger (RAWR!)': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                scale : 0.25,
-                x : 50,
-                y : 50
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            scale: 0.25,
+            x: 50,
+            y: 50
+        });
         var layer = new Kinetic.Layer();
         var group = new Kinetic.Group();
-        
-        for (var i = 0; i < tiger.length; i++) {
+
+        for(var i = 0; i < tiger.length; i++) {
             var path = new Kinetic.Plugins.Path(tiger[i]);
             group.add(path);
         }
-        
+
         group.setDraggable(true);
         layer.add(group);
         stage.add(layer);
-        
-    },	
-    'PATHHELPER - Able to determine point on line some distance from another point on line' : function (containerId) {
+
+    },
+    'PATHHELPER - Able to determine point on line some distance from another point on line': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
-        var c = "M10,10 210,160"; // i.e., from a 3-4-5 triangle
-        
+
+        var c = "M10,10 210,160";
+        // i.e., from a 3-4-5 triangle
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
         layer.add(path);
-        
+
         layer.add(new Kinetic.Ellipse({
-                x : 10,
-                y : 10,
-                radius : 10,
-                fill : 'black'
-            }));
-        
-        var p1 = Kinetic.Plugins.PathHelper.getPointOnLine(125, 10, 10, 210, 160); // should be 1/2 way, or (110,85)
+            x: 10,
+            y: 10,
+            radius: 10,
+            fill: 'black'
+        }));
+
+        var p1 = Kinetic.Geometry.getPointOnLine(125, 10, 10, 210, 160);
+        // should be 1/2 way, or (110,85)
         test(Math.round(p1.x) === 110, 'point X value should be 110');
         test(Math.round(p1.y) === 85, 'point Y value should be 85');
-        
+
         layer.add(new Kinetic.Ellipse({
-                x : p1.x,
-                y : p1.y,
-                radius : 10,
-                fill : 'blue'
-            }));
-        
+            x: p1.x,
+            y: p1.y,
+            radius: 10,
+            fill: 'blue'
+        }));
+
         stage.add(layer);
-        
+
     },
-    'PATHHELPER - Able to determine points on Cubic Bezier Curve' : function (containerId) {
+    'PATHHELPER - Able to determine points on Cubic Bezier Curve': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.5,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.5,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M100,200 C100,100 250,100 250,200 S400,300 400,200";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
         c = 'M 100 200';
-        
-        for (t = 0.25; t <= 1; t += 0.25) {
-            var p1 = Kinetic.Plugins.PathHelper.getPointOnCubicBezier(t, 100, 200, 100, 100, 250, 100, 250, 200);
+
+        for( t = 0.25; t <= 1; t += 0.25) {
+            var p1 = Kinetic.Geometry.getPointOnCubicBezier(t, 100, 200, 100, 100, 250, 100, 250, 200);
             c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
         }
-        
-        for (t = 0.25; t <= 1; t += 0.25) {
-            var p1 = Kinetic.Plugins.PathHelper.getPointOnCubicBezier(t, 250, 200, 250, 300, 400, 300, 400, 200);
+
+        for( t = 0.25; t <= 1; t += 0.25) {
+            var p1 = Kinetic.Geometry.getPointOnCubicBezier(t, 250, 200, 250, 300, 400, 300, 400, 200);
             c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
         }
-        
+
         var testPath = new Kinetic.Plugins.Path({
-                stroke : 'black',
-                strokewidth : 2,
-                data : c
-            });
-        
+            stroke: 'black',
+            strokewidth: 2,
+            data: c
+        });
+
         layer.add(testPath);
         stage.add(layer);
     },
-    'PATHHELPER - Able to determine points on Quadratic Curve' : function (containerId) {
+    'PATHHELPER - Able to determine points on Quadratic Curve': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.333,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.333,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M200,300 Q400,50 600,300 T1000,300";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
         c = 'M 200 300';
-        
-        for (t = 0.333; t <= 1; t += 0.333) {
-            var p1 = Kinetic.Plugins.PathHelper.getPointOnQuadraticBezier(t, 200, 300, 400, 50, 600, 300);
+
+        for( t = 0.333; t <= 1; t += 0.333) {
+            var p1 = Kinetic.Geometry.getPointOnQuadraticBezier(t, 200, 300, 400, 50, 600, 300);
             c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
         }
-        
-        for (t = 0.333; t <= 1; t += 0.333) {
-            var p1 = Kinetic.Plugins.PathHelper.getPointOnQuadraticBezier(t, 600, 300, 800, 550, 1000, 300);
+
+        for( t = 0.333; t <= 1; t += 0.333) {
+            var p1 = Kinetic.Geometry.getPointOnQuadraticBezier(t, 600, 300, 800, 550, 1000, 300);
             c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
         }
-        
+
         var testPath = new Kinetic.Plugins.Path({
-                stroke : 'black',
-                strokewidth : 2,
-                data : c
-            });
-        
+            stroke: 'black',
+            strokewidth: 2,
+            data: c
+        });
+
         layer.add(testPath);
         stage.add(layer);
     },
-    'PATHHELPER - Able to determine points on Elliptical Arc with clockwise stroke' : function (containerId) {
+    'PATHHELPER - Able to determine points on Elliptical Arc with clockwise stroke': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M 50,100 A 100 50 0 1 1 150 150";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
-        var centerParamPoints = Kinetic.Plugins.PathHelper.convertEndpointToCenterParameterization(50, 100, 150, 150, 1, 1, 100, 50, 0);
-        
-        var start = centerParamPoints[4]; // 4 = theta
-        var dTheta = centerParamPoints[5]; // 5 = dTheta
+
+        var centerParamPoints = path.convertEndpointToCenterParameterization(50, 100, 150, 150, 1, 1, 100, 50, 0);
+
+        var start = centerParamPoints[4];
+        // 4 = theta
+        var dTheta = centerParamPoints[5];
+        // 5 = dTheta
         var end = centerParamPoints[4] + dTheta;
-        var inc = Math.PI / 6.0; // 30 degree resolution
-        
-        var p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, 0);
-            c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
-        
-        if (dTheta < 0) // clockwise
+        var inc = Math.PI / 6.0;
+        // 30 degree resolution
+
+        var p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, 0);
+        c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
+
+        if(dTheta < 0)// clockwise
         {
-            for (t = start - inc; t > end; t -= inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-            }
-        } else // counter-clockwise
-        {
-            for (t = start + inc; t < end; t += inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            for( t = start - inc; t > end; t -= inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
             }
         }
-        
-        p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, 0);
-            c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-        
+        else// counter-clockwise
+        {
+            for( t = start + inc; t < end; t += inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            }
+        }
+        p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, 0);
+        c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+
         var testpath = new Kinetic.Plugins.Path({
-                stroke : 'black',
-                strokeWidth : 2,
-                data : c
-            });
-        
+            stroke: 'black',
+            strokeWidth: 2,
+            data: c
+        });
+
         layer.add(testpath);
         stage.add(layer);
     },
-    'PATHHELPER - Able to determine points on Elliptical Arc with counter-clockwise stroke' : function (containerId) {
+    'PATHHELPER - Able to determine points on Elliptical Arc with counter-clockwise stroke': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M 250,100 A 100 50 0 1 0 150 150";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
-        var centerParamPoints = Kinetic.Plugins.PathHelper.convertEndpointToCenterParameterization(250, 100, 150, 150, 1, 0, 100, 50, 0);
-        
-        var start = centerParamPoints[4]; // 4 = theta
-        var dTheta = centerParamPoints[5]; // 5 = dTheta
+
+        var centerParamPoints = path.convertEndpointToCenterParameterization(250, 100, 150, 150, 1, 0, 100, 50, 0);
+
+        var start = centerParamPoints[4];
+        // 4 = theta
+        var dTheta = centerParamPoints[5];
+        // 5 = dTheta
         var end = centerParamPoints[4] + dTheta;
-        var inc = Math.PI / 6.0; // 30 degree resolution
-        
-        var p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, 0);
-            c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
-        
-        if (dTheta < 0) // clockwise
+        var inc = Math.PI / 6.0;
+        // 30 degree resolution
+
+        var p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, 0);
+        c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
+
+        if(dTheta < 0)// clockwise
         {
-            for (t = start - inc; t > end; t -= inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-            }
-        } else // counter-clockwise
-        {
-            for (t = start + inc; t < end; t += inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            for( t = start - inc; t > end; t -= inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
             }
         }
-        
-        p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, 0);
-            c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-        
+        else// counter-clockwise
+        {
+            for( t = start + inc; t < end; t += inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, 0);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            }
+        }
+        p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, 0);
+        c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+
         var testpath = new Kinetic.Plugins.Path({
-                stroke : 'black',
-                strokeWidth : 2,
-                data : c
-            });
-        
+            stroke: 'black',
+            strokeWidth: 2,
+            data: c
+        });
+
         layer.add(testpath);
         stage.add(layer);
     },
-    'PATHHELPER - Able to determine points on Elliptical Arc when rotated' : function (containerId) {
+    'PATHHELPER - Able to determine points on Elliptical Arc when rotated': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M 250,100 A 100 50 30 1 0 150 150";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 3
-            });
-        
+            stroke: 'red',
+            strokeWidth: 3
+        });
+
         path.setData(c);
-        
+
         layer.add(path);
-        
-        var centerParamPoints = Kinetic.Plugins.PathHelper.convertEndpointToCenterParameterization(250, 100, 150, 150, 1, 0, 100, 50, 30);
-        
-        var start = centerParamPoints[4]; // 4 = theta
-        var dTheta = centerParamPoints[5]; // 5 = dTheta
+
+        var centerParamPoints = path.convertEndpointToCenterParameterization(250, 100, 150, 150, 1, 0, 100, 50, 30);
+
+        var start = centerParamPoints[4];
+        // 4 = theta
+        var dTheta = centerParamPoints[5];
+        // 5 = dTheta
         var end = centerParamPoints[4] + dTheta;
-        var inc = Math.PI / 6.0; // 30 degree resolution
-        var psi = centerParamPoints[6]; // 6 = psi radians
-        
-        var p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, psi);
-            c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
-        
-        if (dTheta < 0) // clockwise
+        var inc = Math.PI / 6.0;
+        // 30 degree resolution
+        var psi = centerParamPoints[6];
+        // 6 = psi radians
+
+        var p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], start, psi);
+        c = 'M ' + p1.x.toString() + ' ' + p1.y.toString();
+
+        if(dTheta < 0)// clockwise
         {
-            for (t = start - inc; t > end; t -= inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, psi);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-            }
-        } else // counter-clockwise
-        {
-            for (t = start + inc; t < end; t += inc) {
-                p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, psi);
-                    c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            for( t = start - inc; t > end; t -= inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, psi);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
             }
         }
-        
-        p1 = Kinetic.Plugins.PathHelper.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, psi);
-            c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
-        
+        else// counter-clockwise
+        {
+            for( t = start + inc; t < end; t += inc) {
+                p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], t, psi);
+                c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+            }
+        }
+        p1 = Kinetic.Geometry.getPointOnEllipticalArc(centerParamPoints[0], centerParamPoints[1], centerParamPoints[2], centerParamPoints[3], end, psi);
+        c += ' ' + p1.x.toString() + ' ' + p1.y.toString();
+
         var testpath = new Kinetic.Plugins.Path({
-                stroke : 'black',
-                strokeWidth : 2,
-                data : c
-            });
-        
+            stroke: 'black',
+            strokeWidth: 2,
+            data: c
+        });
+
         layer.add(testpath);
         stage.add(layer);
     },
-    'TEXTPATH - Render Text Along Line' : function (containerId) {
+    'TEXTPATH - Render Text Along Line': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M 10,10 300,150";
-        
+
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 1,
-                data : c
-            });
-        
+            stroke: 'red',
+            strokeWidth: 1,
+            data: c
+        });
+
         layer.add(path);
-        
+
         var textpath = new Kinetic.Plugins.TextPath({
-                textStroke : 'black',
-                textStrokeWidth : 1,
-                textFill : 'orange',
-                fontSize : '18',
-                fontFamily : 'Arial',
-                text : 'The quick brown fox jumped over the lazy dog\'s back',
-                data : c
-            });
-        
+            textStroke: 'black',
+            textStrokeWidth: 1,
+            textFill: 'orange',
+            fontSize: '18',
+            fontFamily: 'Arial',
+            text: 'The quick brown fox jumped over the lazy dog\'s back',
+            data: c
+        });
+
         layer.add(textpath);
         stage.add(layer);
     },
-    'TEXTPATH - Render Text Along two connected Bezier' : function (containerId) {
+    'TEXTPATH - Render Text Along two connected Bezier': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M10,10 C0,0 10,150 100,100 S300,150 400,50";
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 1,
-                data : c
-            });
-        
+            stroke: 'red',
+            strokeWidth: 1,
+            data: c
+        });
+
         layer.add(path);
-        
+
         var textpath = new Kinetic.Plugins.TextPath({
-                textStroke : 'black',
-                textStrokeWidth : 1,
-                textFill : 'orange',
-                fontSize : '8',
-                fontFamily : 'Arial',
-                text : 'All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
-                data : c
-            });
-        
+            textStroke: 'black',
+            textStrokeWidth: 1,
+            textFill: 'orange',
+            fontSize: '8',
+            fontFamily: 'Arial',
+            text: 'All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
+            data: c
+        });
+
         layer.add(textpath);
         stage.add(layer);
-        
+
     },
-    'TEXTPATH - Render Text Along Elliptical Arc' : function (containerId) {
+    'TEXTPATH - Render Text Along Elliptical Arc': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 1,
-                x : 50,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 1,
+            x: 50,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = "M 250,100 A 100 50 30 1 0 150 150";
         var path = new Kinetic.Plugins.Path({
-                stroke : 'red',
-                strokeWidth : 1,
-                data : c
-            });
-        
+            stroke: 'red',
+            strokeWidth: 1,
+            data: c
+        });
+
         layer.add(path);
-        
+
         var textpath = new Kinetic.Plugins.TextPath({
-                textFill : 'black',
-                fontSize : '10',
-                text : 'All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
-                data : c
-            });
-        
+            textFill: 'black',
+            fontSize: '10',
+            text: 'All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.',
+            data: c
+        });
+
         layer.add(textpath);
         stage.add(layer);
     },
-    'TEXTPATH - Render Text Along complex path' : function (containerId) {
+    'TEXTPATH - Render Text Along complex path': function(containerId) {
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.25,
-                x : 10,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.25,
+            x: 10,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var c = 'M 955.92249,-42.126952 L 955.92249,-42.126952 L 955.92249,-42.126952 L 961.93262,212.9279 C 961.72797,213.3372 961.22315,215.2234 960.80572,215.5574 C 957.45077,218.2413 956.9054,218.3026 953.66869,216.6843 C 952.62164,216.1607 951.67338,214.3658 949.91236,214.8061 C 947.3405,215.4491 948.09281,215.8744 946.53166,217.4355 C 945.22315,218.744 943.52659,219.8744 943.52659,222.3188 C 943.52659,225.6087 944.62943,224.7909 946.15603,226.8264 C 947.55965,228.6979 948.18154,229.6696 948.78546,232.0852 C 949.37174,234.4304 951.2918,235.2197 952.16616,236.9685 C 953.11809,238.8723 956.44837,240.9001 955.17122,242.6029 C 955.17122,242.8772 955.27602,243.9657 955.17122,244.1055 C 954.37248,245.1705 952.25782,247.1195 951.79052,248.9887 C 951.25154,251.1447 951.97226,252.3937 951.41489,254.6232 C 950.9178,256.6116 949.53672,257.6472 949.53672,259.8821 C 949.53672,261.2894 949.87203,263.5578 950.66362,265.1409 C 951.32462,266.4629 953.24159,268.3158 953.66869,270.0242 C 954.03114,271.474 954.12634,273.8281 953.66869,275.6587 C 953.20033,277.5321 952.16616,278.7427 952.16616,280.9175 C 952.16616,281.7694 952.66216,286.9313 952.16616,287.3033 C 950.55129,287.3033 950.38215,287.5144 949.16109,288.4302 C 947.74898,289.4893 945.57047,291.4095 944.65349,292.9378 C 943.57061,294.7426 942.86906,296.6011 942.3997,298.9479 C 941.97063,301.0933 941.32659,303.0261 940.1459,304.2068 C 938.60102,305.7517 939.019,307.4128 939.019,309.8413 C 939.019,311.6467 939.44296,314.3005 938.26773,315.4758 C 937.15545,316.5881 934.88703,318.5361 934.88703,320.7346 C 934.88703,322.7058 934.79432,324.8714 935.26267,326.7448 C 935.72373,328.589 935.6383,330.6902 935.6383,332.7549 C 935.6383,334.5937 936.08895,337.1125 935.26267,338.765 C 933.38787,342.5146 935.26267,342.5858 935.26267,345.5264 C 935.61053,346.9179 935.6383,348.2383 935.6383,350.034 C 935.6383,351.5752 934.96036,354.5783 932.63323,353.4147 C 932.09123,353.1437 928.92886,348.8032 927.75,351.1609 C 926.64231,353.3763 926.87972,354.3829 928.12564,356.0442 C 929.10471,357.3496 930.01787,360.3569 928.12564,361.303 C 926.67006,362.0308 924.24963,362.5828 924.74494,365.0593 C 925.21304,367.3998 926.19847,367.8684 926.6231,369.567 C 926.7781,370.1869 927.80544,374.5783 926.24747,375.2014 C 924.2456,376.0022 920.63857,376.64 919.86171,378.5821 C 918.7844,381.2754 918.89909,381.8572 921.36424,383.0897 C 922.93947,383.8774 923.65296,384.6272 925.12057,386.0948 C 925.4026,386.3768 928.41848,391.3951 926.99874,392.1049 C 926.6231,392.2301 926.22599,392.3035 925.87184,392.4806 C 924.02717,393.4029 922.07311,394.7556 920.61297,395.4856 C 918.19436,396.6949 919.66034,398.0609 920.23734,400.3689 C 920.66358,402.0738 920.9143,404.1809 919.48607,405.2521 C 918.27148,406.163 916.40598,407.9567 914.60284,407.5059 C 912.7458,407.0416 911.06841,406.8699 909.71961,407.8815 C 908.08698,409.106 906.39997,410.6424 905.96328,412.3891 C 905.46424,414.3853 903.5041,416.8116 901.83132,417.648 C 900.14443,418.4914 897.73682,419.2163 895.82119,420.6531 C 894.39644,421.7216 891.99114,423.3808 890.93796,424.785 C 889.59804,426.5716 888.40557,428.0687 886.80599,429.6682 C 885.18365,431.2906 883.35936,432.8052 882.29839,434.9271 C 881.56876,436.3864 879.95545,436.9836 879.29333,438.3078 C 878.57656,439.7413 877.73542,441.3406 876.28826,442.0641 C 874.75553,442.8305 873.35007,443.456 871.40503,443.9423 C 867.75936,444.8537 869.30342,446.1864 868.7756,448.8255 C 868.7756,449.4008 868.88599,450.1518 868.7756,450.7037 C 868.4147,452.5082 867.97176,454.46 866.14617,454.46 C 863.87643,454.46 863.13519,452.5202 860.51167,452.9575 C 858.30041,453.326 855.7288,453.4708 853.75028,454.46 C 851.66578,455.5023 850.88183,456.6114 849.24268,457.8407 C 848.34172,458.5165 844.59521,461.2214 842.85692,461.2214 C 841.06194,461.2214 838.75283,461.625 837.59805,460.4702 C 836.02546,458.8976 834.59299,457.0331 834.59299,454.8357 C 834.59299,452.5753 834.44046,450.9268 833.09045,449.5768 C 831.22582,447.7122 830.88608,448.6344 829.33412,450.7037 C 827.57516,453.049 826.50225,455.876 824.07526,457.0895 C 820.97109,458.6416 819.33963,458.3772 818.44076,461.9727 C 817.87317,464.2431 816.93823,466.7246 816.93823,469.1097 C 816.93823,470.8675 817.70296,474.7173 816.93823,476.2468 C 816.14706,477.8291 812.41394,478.9791 810.9281,476.998 C 808.83845,474.2118 810.41749,473.2417 805.66924,473.2417 C 801.6473,473.2417 799.28347,473.0146 799.28347,477.3737 C 799.28347,479.1155 799.58784,484.5107 796.65404,484.5107 C 796.27841,484.5107 795.90277,484.5107 795.52714,484.5107 C 793.06311,484.5107 790.57051,484.2819 789.51701,486.3889 C 789.24153,486.9398 789.17021,490.492 788.39011,491.2721 C 785.76325,493.8989 789.66759,493.7526 790.26828,496.1553 C 790.57092,497.3659 791.29959,501.1341 790.26828,502.1654 C 788.37505,504.0587 788.1443,505.2726 787.63885,507.7999 C 787.12622,510.3631 787.28641,510.4294 784.25815,510.4294 C 779.52049,510.4294 778.62062,512.1783 781.25308,515.6882 C 782.04773,516.7478 784.15693,519.0183 785.76068,519.8202 C 787.2339,520.5568 788.2453,521.5264 787.63885,523.9522 C 787.29534,525.3262 785.38505,526.8783 785.38505,528.8354 C 785.38505,532.3304 785.96541,532.0452 787.63885,533.7186 C 789.35939,535.4392 791.26358,536.4988 790.64391,538.9775 C 790.07532,541.2518 787.846,540.5966 785.38505,540.1044 C 784.8577,539.9989 777.87238,538.1167 777.87238,538.2262 C 777.87238,538.3043 777.87238,541.4667 777.87238,543.1095 C 777.87238,545.7389 776.11001,547.6978 773.74042,549.1196 C 769.72179,551.5308 769.56137,548.92 765.85212,547.9927 C 764.43987,547.6396 762.84706,547.0925 762.84706,544.9876 C 762.84706,542.5025 764.72522,540.5566 764.72522,538.9775 C 764.72522,537.481 764.49962,535.4457 763.97396,533.343 C 763.53464,531.5857 763.96677,529.2128 760.96889,529.9623 C 759.74476,530.2683 755.76059,530.9158 755.3344,529.211 C 754.79258,527.0438 753.83472,525.0819 752.32933,523.5765 C 751.7239,522.9711 748.78535,518.481 747.07047,520.1958 C 745.42956,521.8367 745.1923,522.8794 745.1923,525.4547 C 745.1923,529.5231 743.80555,527.5927 741.43597,529.9623 C 739.21241,532.1859 738.84328,532.0691 738.05527,535.2212 C 737.62578,536.9391 737.33255,538.9489 736.17711,540.1044 C 735.37222,540.9093 731.5352,542.6268 730.91824,543.8607 C 729.89113,545.9149 730.31425,546.7847 731.29388,548.744 C 731.93347,550.0231 732.94949,551.8879 732.42078,554.0028 C 731.86797,556.214 729.92914,558.5699 727.16191,559.2617 C 726.16187,559.7617 724.82639,560.5029 723.78121,560.7642 C 721.91594,561.2305 719.64925,561.351 719.64925,564.1449 C 719.64925,566.832 719.04019,568.7236 721.15178,569.7794 C 722.21289,570.31 724.72561,571.2926 725.28375,572.4088 C 726.18968,574.2207 726.03501,576.214 726.03501,578.419 C 726.03501,580.9518 724.90811,582.9761 724.90811,585.1804 C 724.90811,587.587 724.17206,589.3326 725.28375,590.8149 C 726.38582,592.2843 727.68532,592.9085 728.28881,595.3225 C 728.47077,596.0503 729.29883,599.6882 728.66444,600.957 C 728.20299,601.8799 726.62388,604.7133 724.90811,604.7133 C 722.23081,604.7133 719.55156,603.2108 717.77108,603.2108 C 712.9722,603.2108 711.01958,602.0443 709.88279,606.5915 C 709.52114,608.038 708.85871,610.3121 708.38026,612.2259 C 707.78279,614.6158 706.87772,616.6877 706.87772,619.363 C 706.87772,621.8398 706.7087,624.1711 706.12646,626.5 C 705.78303,627.8737 704.58011,630.6495 702.74576,631.3832 C 700.14612,632.4231 699.90837,632.6269 696.73563,633.2614 C 695.19072,633.5704 692.38471,634.0127 690.34987,634.0127 C 687.92024,634.0127 684.24023,633.3112 682.08594,634.3883 C 680.51621,635.1732 677.63742,637.5327 677.20271,639.2715 C 676.32889,642.7668 669.65019,641.1298 666.68498,639.6472 C 665.51347,639.0614 662.57658,637.112 662.17738,635.5152 C 661.57521,633.1065 663.16351,629.2235 662.17738,627.2513 C 661.26634,625.4292 659.87344,623.4448 658.42105,621.9924 C 657.38134,620.9527 655.38855,620.0777 654.28908,618.6117 C 653.089,617.0116 651.62053,616.0553 650.15712,614.1041 C 648.34003,611.6813 647.12666,612.2259 643.77136,612.2259 C 639.94754,612.2259 634.27092,612.8011 630.99983,610.3478 C 628.83169,608.7217 627.09631,607.7996 625.74097,605.0889 C 624.63961,602.8862 624.51407,601.3082 623.8628,598.7032 C 623.8628,597.1031 624.2465,594.9791 623.8628,593.4443 C 623.39918,591.5898 621.23337,589.3243 621.23337,587.4342 C 621.23337,587.1837 621.29411,586.9258 621.23337,586.6829 C 620.53685,583.8968 622.36027,582.4393 622.36027,580.6728 C 622.36027,578.1478 621.87342,577.1809 620.10647,575.4139 C 619.11396,574.4214 614.71345,572.543 612.96944,574.287 C 611.60526,575.6512 609.17921,577.309 606.95931,578.419 C 604.01326,579.892 598.66588,576.9755 597.19285,579.9215 C 596.40756,581.4921 595.76926,583.6587 595.31468,585.9316 C 594.88705,588.0698 594.09657,589.556 591.55835,590.0636 C 590.26591,590.3221 585.80562,591.0513 585.17259,592.3174 C 584.45323,593.7561 582.33804,595.3917 581.79189,597.5763 C 581.21425,599.8868 580.53762,600.7708 578.78683,602.0839 C 576.60544,603.7199 574.24457,604.0233 571.27416,602.8351 C 569.56134,602.15 566.96195,601.3583 564.51277,601.7082 C 562.15094,602.0456 560.7219,604.7047 559.2539,604.3377 C 556.608,603.6762 556.41629,603.5592 554.74631,601.3326 C 553.7801,600.0443 552.83677,595.5353 551.36561,594.9468 C 549.22437,594.0903 546.63624,594.001 543.85294,593.4443 C 541.39906,592.9535 538.87331,593.0687 536.34028,593.0687 C 532.49916,593.0687 532.93906,592.2969 530.70579,590.0636 C 529.57858,588.9364 527.94151,588.118 525.82255,587.0585 C 523.85495,586.0747 523.02163,585.6928 520.56369,586.3073 C 518.15725,586.9089 517.4765,588.4877 515.68046,588.9367 C 514.53264,589.2237 511.38458,588.643 510.04596,589.3123 C 508.49749,590.0866 507.19267,590.5834 506.66527,592.693 C 506.20828,594.521 505.99947,595.9598 504.7871,597.5763 C 503.10137,599.8239 501.43481,599.4686 499.1526,598.3275 C 496.74377,597.1231 496.63249,597.7484 493.89374,597.2006 C 491.45635,596.7131 490.45647,596.313 488.63487,594.9468 C 486.20245,593.1225 485.84728,591.7342 484.87854,589.3123 C 484.34805,587.9861 483.82138,584.0535 482.24911,584.0535 C 479.1858,584.0535 478.32694,584.2633 476.23898,582.1753 C 475.01433,580.9507 474.104,579.7043 472.85828,578.0433 C 471.87387,576.7308 471.15841,575.0383 468.72632,575.0383 C 465.62648,575.0383 465.0931,574.4101 463.09182,572.4088 C 461.80618,571.1232 459.77548,570.155 457.45733,570.155 C 454.22738,570.155 453.13567,570.2034 450.69593,572.0332 C 449.01793,573.2917 445.74427,574.287 443.5589,574.287 C 441.14907,574.287 438.88122,574.5776 436.7975,573.5357 C 435.27776,572.7759 434.01441,571.5961 432.28991,570.9063 C 429.9965,569.989 427.79078,568.6525 425.15288,568.6525 C 423.40022,568.6525 419.8328,569.7488 418.39148,569.0281 C 418.14106,568.9029 417.89064,568.7777 417.64021,568.6525 C 415.49479,567.5798 416.55622,567.2358 415.38641,564.8962 C 414.77237,563.6681 414.63515,562.1788 414.63515,560.0129 C 414.63515,558.3145 415.04465,556.0165 414.63515,554.3784 C 414.06491,552.0975 414.24886,549.8602 412.38135,547.9927 C 411.40995,547.0213 409.24156,545.0938 408.62502,543.8607 C 408.07318,542.757 407.08617,540.8193 405.99559,539.7288 C 404.23882,537.972 404.86869,537.4962 404.86869,535.2212 C 404.86869,532.3223 402.92378,530.8222 402.23926,528.0841 C 402.03511,527.2676 400.20775,523.9522 399.23419,523.9522 C 397.40724,523.9522 395.17436,524.3278 393.59969,524.3278 C 392.1471,524.3278 388.62445,524.895 387.9652,523.5765 C 387.16017,521.9665 386.46266,520.8647 386.46266,518.3177 C 386.46266,517.2392 387.06995,513.4929 386.46266,512.6832 C 385.44124,511.3213 383.94518,508.9268 382.3307,508.9268 C 380.0442,508.9268 378.68472,509.6505 377.07184,510.0537 C 374.43842,510.7121 375.12089,510.9506 374.06677,513.0588 C 372.99551,515.2013 371.43568,515.6866 369.55917,513.8101 C 367.11608,511.367 367.54854,511.9833 366.17847,513.8101 C 364.4331,516.1372 362.02692,517.942 359.04145,517.942 C 356.27733,517.942 354.79253,517.3325 353.78258,515.3126 C 352.71976,513.187 352.20547,512.3075 349.65062,512.3075 C 347.43943,512.3075 345.67638,511.8115 345.14302,509.6781 C 344.69437,507.8835 343.8574,505.0515 342.51359,504.0436 C 341.49931,503.2829 339.32282,500.99 337.25472,502.5411 C 336.12724,503.3867 330.59067,511.5766 329.49596,511.5766 L 339.92116,9.4291543 L 531.3294,9.5579943 C 531.53498,9.8775343 531.74056,10.197084 531.94614,10.516624 C 532.70213,11.691684 530.89998,12.894794 530.62953,14.247024 C 530.42067,15.291354 532.94855,14.371684 533.70163,15.124764 C 533.96143,15.384574 533.06188,17.795104 533.26276,18.196854 C 533.6241,18.919554 537.09651,16.118584 537.43203,15.783074 C 538.52925,14.685844 541.26067,15.533334 542.2596,15.783074 C 544.36225,16.308734 544.53484,13.969904 545.77057,16.441374 C 546.72008,18.340404 548.8757,18.577754 550.81758,18.855164 C 551.5334,18.957424 552.36959,15.108804 552.7925,14.685894 C 553.70371,13.774684 554.04733,13.026284 554.76742,14.466454 C 555.55609,16.043794 556.96728,16.885754 558.27838,18.196854 C 559.14892,19.067394 560.36843,19.874104 561.35048,20.610644 C 562.42985,21.420174 563.12715,21.998014 564.20314,22.805004 C 565.9662,24.127294 567.78898,25.511804 570.12789,26.096534 C 572.7652,26.755854 576.55367,27.553934 578.90531,28.729754 C 580.9132,29.733704 583.43718,29.459644 585.48837,30.485234 C 586.49144,30.986774 588.94826,31.133324 590.09651,31.362974 C 591.42028,32.024864 591.77294,34.338314 592.07143,35.532254 C 592.3559,36.670124 593.11993,38.320014 593.82691,39.262654 C 594.69143,40.415344 596.17315,41.423224 597.11844,41.895874 C 598.26675,42.470034 600.11464,43.649294 601.28771,44.529104 C 602.4452,45.397214 603.546,45.151114 603.04319,47.162324 C 602.73764,48.384554 601.38101,48.605074 600.62941,49.356674 C 599.50817,50.477904 599.93932,51.519254 600.84884,52.428774 C 601.81016,53.390084 603.26382,53.305314 604.14037,52.428774 C 604.62824,51.940894 608.18038,52.428774 608.96795,52.428774 C 611.1468,52.428774 610.66216,51.127474 612.47891,50.673284 C 612.63759,50.633624 612.77149,50.526994 612.91778,50.453854 C 614.68717,49.569154 616.9206,51.445064 617.9648,49.356674 C 618.52936,48.227544 619.56541,48.220674 619.93972,46.723454 C 620.25133,45.477014 620.37729,44.531694 621.03689,43.212484 C 621.76915,41.747964 621.9135,40.434484 622.79237,39.262654 C 623.77356,37.954414 624.27391,36.972204 625.64503,36.629424 C 627.98413,36.044654 628.95445,36.884634 629.81431,38.604344 C 630.5868,40.149334 629.04661,41.566394 628.05882,42.554184 C 627.03053,43.582464 626.94563,46.049134 627.83939,46.942884 C 628.71859,47.822094 631.7203,46.960114 632.66697,46.723454 C 635.14429,46.104124 638.40825,46.723454 641.00551,46.723454 C 642.99376,46.723454 643.25279,47.744904 644.29704,49.137244 C 645.27121,50.436134 645.05681,51.584644 643.63873,52.648204 C 642.199,53.728004 640.62809,54.372964 639.25003,55.061994 C 637.13418,56.119914 635.43133,55.127564 633.54471,54.184254 C 631.95211,53.387954 630.44161,53.389994 628.71713,53.964814 C 626.84122,54.590124 627.42091,55.720304 625.20616,55.720304 C 623.21044,55.720304 622.67528,55.410144 621.25633,54.842564 C 619.91862,54.307474 619.00883,54.278974 617.9648,55.061994 C 617.10854,55.704184 616.39298,55.720304 614.8927,55.720304 C 613.05499,55.720304 612.78965,55.409564 611.82061,56.378604 C 611.11873,57.080484 611.94664,57.914654 609.40682,57.914654 C 607.90864,57.914654 607.56008,59.135134 606.55416,59.889574 C 605.2063,60.900474 602.08634,60.328444 600.40997,60.328444 C 598.82692,60.328444 597.23216,60.282954 596.02126,60.767314 C 592.93299,62.002624 597.05347,63.219724 597.77675,63.400534 C 599.71594,63.885334 600.39327,64.211484 600.84884,66.033764 C 601.33813,67.990904 602.14535,68.474354 603.48206,66.692064 C 604.91144,64.786234 602.91352,64.497714 606.77359,64.497714 C 607.59464,64.497714 608.63043,67.232284 608.96795,67.569814 C 610.45793,69.059794 611.16665,70.095494 613.13722,71.080774 C 614.46498,71.744654 616.30615,67.595574 616.64819,66.911504 C 617.28296,65.641964 617.99069,64.704204 619.28141,64.058844 C 621.30547,63.046814 622.75619,64.278284 624.76729,64.278284 C 626.50942,64.278284 627.61995,65.003454 627.61995,62.742234 C 627.61995,61.212584 627.63406,61.199134 628.93656,60.547884 C 628.93656,59.039954 631.8995,61.398604 633.10584,62.303364 C 634.22905,63.145774 635.25806,64.560214 636.6168,65.375454 C 638.02819,66.222284 639.45789,65.179164 639.90833,64.278284 C 640.50672,63.081494 642.69629,63.368184 643.63873,63.839414 C 644.9694,64.504744 646.71554,64.500074 648.02744,65.156024 C 649.65658,65.970594 651.25018,66.091894 652.63558,67.130944 C 654.5709,68.582434 655.72441,69.284754 658.12146,69.764164 C 660.76933,70.293734 662.17378,70.473704 664.26565,71.519644 C 666.22906,72.501344 668.08427,73.121854 669.75154,74.372304 C 670.99777,75.306984 673.61008,75.688914 675.23742,75.688914 C 678.09495,75.688914 679.5978,74.715624 682.03992,73.494564 C 683.61178,72.708634 685.09563,72.194334 686.20919,71.080774 C 687.25214,70.037824 688.09533,68.975204 689.28128,67.789244 C 690.81968,66.250844 691.90496,66.472634 694.10886,66.472634 C 695.98476,66.472634 697.61589,67.130944 699.37531,67.130944 C 700.88236,67.130944 702.30921,68.008684 703.98345,68.008684 C 705.78815,68.008684 706.82154,67.443974 708.15272,66.911504 C 709.49084,66.376254 710.32631,65.391024 711.22482,64.717154 C 712.93357,63.435584 713.93405,62.155634 715.83296,61.206184 C 717.44839,60.398474 719.60451,59.255264 721.09941,58.134094 C 722.32027,57.218444 724.55866,55.842944 725.92699,55.500864 C 727.42616,55.126074 729.09302,54.102794 730.53513,53.525944 C 732.4374,52.765044 734.47148,52.545224 736.02101,51.770464 C 736.81463,51.373654 738.38579,51.112164 739.31254,51.112164 C 739.58229,50.977294 739.8977,50.965874 740.19028,50.892724 C 741.93619,50.456234 744.97275,50.145724 746.55391,51.331594 C 747.77567,52.247914 749.08929,52.550364 750.06487,53.525944 C 751.05366,54.514734 751.10636,54.963084 752.6981,55.281434 C 753.97746,55.537304 755.20688,54.403694 756.64793,54.403694 C 757.60799,54.403694 759.65763,56.143574 760.59777,56.378604 C 762.10547,56.755534 763.41059,56.817474 764.98648,56.817474 C 766.46659,56.817474 768.85254,54.943624 770.47236,54.403694 C 772.25575,53.809224 773.23113,53.525944 775.29994,53.525944 C 777.348,53.525944 779.39606,53.525944 781.44413,53.525944 C 783.12504,53.525944 784.01926,53.375894 785.17453,53.087074 C 786.13177,52.847764 786.81429,52.867644 787.80775,52.867644 C 789.68721,52.397784 790.54366,51.799654 792.41589,51.331594 C 793.72507,51.004304 794.52824,48.862394 795.04912,47.820634 C 795.74654,46.425784 796.31421,45.768114 797.24347,44.529104 C 798.0814,43.411864 799.90954,42.318324 801.19331,41.676444 C 802.47959,41.033304 803.007,40.301614 804.04597,39.262654 C 804.9791,38.329524 805.42163,37.448114 806.24032,36.629424 C 807.32555,35.544194 808.33509,33.723304 809.09298,32.460154 C 809.72369,31.408974 811.13754,30.635024 812.16508,29.607494 C 812.75994,29.012634 816.59236,28.500674 817.43152,28.290884 C 818.9728,27.905564 820.03772,26.864014 820.94249,25.657664 C 821.81326,24.496634 822.20664,23.673144 822.47854,22.585564 C 822.70979,21.660554 823.16846,20.484194 823.35628,19.732904 C 823.39176,19.590984 823.35628,19.440324 823.35628,19.294034 C 824.72829,14.181234 833.5556,11.720324 838.16552,9.4153643 C 840.3455,8.3253643 841.62867,5.2222343 843.25846,3.0491743 C 844.34873,1.5954943 847.99376,1.4409443 850.04906,0.92711429 C 853.15105,0.15161429 855.95039,-0.84630571 858.11289,-2.4681757 C 860.2827,-4.0955457 863.83523,-5.3512957 866.17672,-6.2878857 C 868.93603,-7.3916157 871.61677,-9.3068957 873.81614,-10.956426 C 875.97519,-12.575706 878.16034,-13.552932 880.60673,-14.776132 C 882.92916,-15.937342 883.77331,-17.477632 886.5485,-18.171422 C 890.51751,-19.163682 894.57232,-17.476362 898.43204,-19.020252 C 901.2465,-20.146032 904.60721,-21.731172 907.3447,-22.415552 C 909.30842,-22.906482 911.47245,-25.328252 913.28647,-26.235262 C 916.00359,-27.593822 917.08159,-29.412202 919.65265,-30.054972 C 921.32298,-30.472552 924.26602,-31.730552 926.44325,-32.601442 C 928.89479,-33.582062 931.86421,-33.402072 933.65826,-34.299092 C 936.16619,-35.553052 937.08458,-36.322802 939.17561,-36.845562 C 941.67817,-37.471202 944.13749,-38.007702 946.81503,-38.543212 C 948.94134,-38.968472 950.98649,-40.592612 952.33239,-41.938512 C 953.1616,-42.767712 955.07166,-42.233042 955.92249,-42.126952 z ';
-            
-            var textpath = new Kinetic.Plugins.TextPath({
-                y : 50,
-                textFill : 'black',
-                fontSize : '24',
-                text : Array(4).join('All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.'),
-                data : c
-            });
-        
+
+        var textpath = new Kinetic.Plugins.TextPath({
+            y: 50,
+            textFill: 'black',
+            fontSize: '24',
+            text: Array(4).join('All the world\'s a stage, and all the men and women merely players. They have their exits and their entrances; And one man in his time plays many parts.'),
+            data: c
+        });
+
         layer.add(textpath);
         stage.add(layer);
     },
-    'PATH - Borneo Map (has scientific notation: -10e-4)' : function (containerId) {
-        
+    'PATH - Borneo Map (has scientific notation: -10e-4)': function(containerId) {
+
         var stage = new Kinetic.Stage({
-                container : containerId,
-                width : 1024,
-                height : 480,
-                throttle : 80,
-                scale : 0.75,
-                x : 10,
-                y : 10
-            });
+            container: containerId,
+            width: 1024,
+            height: 480,
+            throttle: 80,
+            scale: 0.75,
+            x: 10,
+            y: 10
+        });
         var layer = new Kinetic.Layer();
-        
+
         var borneo = new Kinetic.Plugins.Path({
-                data : "m 136.68513,236.08861 c -0.63689,-0.67792 -0.75417,-1.28099 -1.03556,-5.32352 -0.26489,-3.80589 -0.4465,-4.81397 -1.09951,-6.1026 -0.51169,-1.00981 -0.98721,-1.54361 -1.375,-1.54361 -0.8911,0 -3.48931,-1.22828 -3.80975,-1.80103 -0.16294,-0.29089 -0.87295,-0.56825 -1.68693,-0.65886 -1.13423,-0.12629 -1.91094,0.0661 -4.02248,0.99633 -4.0367,1.77835 -5.46464,1.87106 -6.79674,0.44127 -0.51948,-0.55765 -0.64763,-1.12674 -0.64763,-2.87683 l 0,-2.18167 -0.87832,0.20996 c -0.48312,0.11549 -1.12041,0.33383 -1.41635,0.4852 -1.52799,0.78172 -4.61534,-0.0398 -5.55846,-1.47906 -0.30603,-0.46718 -1.06518,-1.19501 -1.68667,-1.61739 -1.27136,-0.86387 -1.62607,-0.6501 -1.63439,0.98494 -0.007,1.00822 -0.76687,2.38672 -1.31885,2.38672 -0.17579,0 -1.27182,0.66553 -2.4356,1.47895 -4.016775,2.8076 -6.006455,3.29182 -7.693525,1.87231 -0.52348,-0.44054 -1.43004,-1.00203 -2.01445,-1.24775 -1.35902,-0.57143 -2.10139,-0.21496 -5.36296,2.57523 -2.00259,1.71315 -2.55857,2.02869 -3.57441,2.02869 -0.66172,0 -1.31931,-0.17966 -1.46135,-0.39925 -0.27734,-0.42865 -0.75823,-5.15099 -0.87007,-8.54399 -0.0708,-2.14922 -0.41754,-3.83281 -0.78935,-3.83281 -0.1176,0 -0.45993,0.28746 -0.76078,0.63881 -0.66657,0.77849 -3.4572,0.87321 -4.70537,0.15969 -1.29782,-0.7419 -2.38029,-0.55672 -5.01545,0.85797 -2.16783,1.16385 -2.75945,1.33971 -4.5666,1.35746 -1.66762,0.0163 -2.276,-0.12217 -3.09174,-0.70405 -0.61985,-0.44211 -1.09397,-0.5977 -1.21663,-0.39925 -0.32993,0.53385 -2.25686,0.37294 -2.80642,-0.23436 -0.27856,-0.30774 -0.65658,-0.95453 -0.8401,-1.43731 -0.42448,-1.11632 -0.91809,-1.10316 -3.01531,0.0804 -0.93379,0.52702 -2.13107,0.9582 -2.66054,0.9582 -1.46554,0 -1.97734,-0.82307 -2.19476,-3.52955 -0.10515,-1.30865 -0.4137,-2.90864 -0.68575,-3.55553 -0.37975,-0.90312 -0.41736,-1.39768 -0.16196,-2.13038 0.35544,-1.01957 -0.24711,-3.50377 -1.40121,-5.77657 -0.48023,-0.94578 -0.50724,-1.33822 -0.19445,-2.82926 0.40575,-1.93441 -0.0409,-3.36568 -1.16059,-3.72114 -0.3255,-0.10331 -0.93466,-0.55279 -1.35374,-0.99885 -1.12569,-1.19829 -1.03821,-2.92553 0.22088,-4.35957 0.85079,-0.96896 1.01308,-1.45348 1.2082,-3.60666 l 0.22545,-2.48734 -1.16949,-1.19763 c -0.64324,-0.65869 -1.26203,-1.64897 -1.37517,-2.20061 -0.13388,-0.6528 -0.56813,-1.23242 -1.24372,-1.66009 l -1.03807,-0.65709 0,1.0782 c 0,0.59301 -0.21786,1.38922 -0.48413,1.76937 -0.68007,0.97099 -4.56312,2.96438 -5.77445,2.96438 -1.55729,0 -1.88611,-0.67097 -1.88611,-3.84837 0,-3.52819 0.41663,-4.13666 2.83284,-4.13666 1.49279,0 1.57631,-0.0396 1.09598,-0.51996 -0.4316,-0.43155 -0.69566,-0.4587 -1.55343,-0.15971 -0.56839,0.19815 -1.3354,0.35443 -1.70442,0.34729 -0.86278,-0.0167 -2.61563,-1.51607 -3.02205,-2.58498 -0.3513,-0.92403 -0.12267,-3.38466 0.34119,-3.67132 0.16474,-0.1018 -0.39367,-0.50661 -1.24085,-0.89959 -2.032471,-0.94281 -2.321421,-1.35146 -2.487701,-3.51839 -0.0772,-1.00533 -0.30119,-2.31552 -0.4979,-2.91152 -0.48076,-1.45668 -0.16499,-2.30832 0.90163,-2.43139 0.843711,-0.0974 0.860511,-0.14171 0.748911,-1.97594 -0.0696,-1.14269 0.0236,-1.96143 0.23793,-2.09396 0.47223,-0.29188 -2.501621,-3.97433 -3.330171,-4.12358 -0.34456,-0.062 -0.75956,-0.23921 -0.92229,-0.39365 -0.3459,-0.32835 -0.78945,-2.83658 -0.98794,-5.58637 -0.0769,-1.06517 -0.35848,-2.55647 -0.62576,-3.31402 -0.71739,-2.03331 -0.61465,-2.55112 0.76687,-3.86532 l 1.25273,-1.19173 -0.46915,-1.36178 c -0.53343,-1.54826 -0.33638,-2.99085 0.48923,-3.5815 0.65547,-0.46898 1.32731,-2.61652 1.52388,-4.87126 0.13191,-1.51252 0.2658,-1.7153 2.531131,-3.83281 2.21127,-2.06705 2.41106,-2.36144 2.64687,-3.89989 0.31881,-2.07979 0.74608,-2.60075 2.34208,-2.85597 0.69615,-0.11132 1.66359,-0.53718 2.14988,-0.94636 1.89204,-1.59201 4.16695,-1.77416 4.16695,-0.33363 0,0.40454 -0.23171,1.4157 -0.51499,2.24703 -0.28322,0.83134 -0.45486,1.57164 -0.38139,1.64512 0.0735,0.0735 1.32057,0.92807 2.77127,1.89909 2.57827,1.72574 2.68847,1.7655 4.89522,1.7655 1.74495,0 2.50706,-0.15424 3.35669,-0.67937 0.91121,-0.56315 1.2344,-0.61779 1.88934,-0.3194 0.43449,0.19798 1.19684,0.35997 1.69411,0.35997 1.03354,0 1.51204,0.45563 1.67033,1.59058 0.10938,0.78459 0.54215,1.02641 2.56344,1.43244 0.47079,0.0946 1.07249,0.38843 1.33713,0.65302 0.29826,0.29829 0.55659,0.35879 0.67998,0.15922 0.3007,-0.48659 2.51019,-0.38548 3.21433,0.1471 0.90129,0.6817 0.99638,0.6211 1.2201,-0.77786 0.1114,-0.69691 0.4878,-1.53284 0.83642,-1.85761 0.34861,-0.32477 0.76943,-1.29968 0.93532,-2.16645 0.36198,-1.89196 1.67658,-4.95214 2.37708,-5.53353 0.45941,-0.38127 0.45882,-0.50661 -0.007,-1.40586 -0.92929,-1.79695 -1.07762,-2.78281 -0.59325,-3.94207 0.32267,-0.77223 0.71393,-1.13742 1.3562,-1.26589 l 0.90282,-0.18055 -0.12723,-3.168 -0.1273,-3.168021 1.13626,0 c 0.6249,0 1.22425,0.14254 1.33189,0.31676 0.11034,0.17851 0.92013,-0.22348 1.85538,-0.92103 2.57554,-1.920815 3.6054,-2.317745 6.74013,-2.597735 2.80648,-0.25066 4.59942,-0.61535 8.65387,-1.76019 1.05398,-0.29761 2.49129,-0.66582 3.19396,-0.81822 2.5583,-0.55486 5.16562,-1.18239 7.665675,-1.84504 2.13376,-0.56557 2.7297,-0.87493 3.61346,-1.87587 1.968,-2.22882 6.60136,-8.28119 7.54474,-9.85529 0.55323,-0.92329 1.87182,-2.29956 3.218,-3.35904 2.58733,-2.03622 6.23997,-6.36804 7.37413,-8.74536 0.64823,-1.35877 0.73216,-1.8923 0.56253,-3.57654 -0.2316,-2.3005 -0.44696,-2.16353 3.91929,-2.49301 3.85817,-0.29115 6.65679,-1.49266 9.77494,-4.19656 2.99721,-2.5991 5.77546,-4.25711 7.14234,-4.26265 1.34414,-0.005 2.18866,0.95864 1.93792,2.21228 l -0.19117,0.956 1.02783,-0.62674 c 0.66237,-0.40384 1.60221,-0.62716 2.64269,-0.62793 1.73168,-10e-4 3.01752,-0.70122 4.31246,-2.34742 0.89476,-1.13744 0.70339,-1.77317 -0.78398,-2.60556 -0.68465,-0.38314 -1.52661,-1.0834 -1.87097,-1.55613 -0.54929,-0.75408 -0.57635,-0.97959 -0.22059,-1.83856 0.52649,-1.27114 3.93115,-4.11017 4.92904,-4.11017 0.41859,0 1.13672,0.14279 1.59566,0.3173 1.3868,0.52725 2.80354,-0.28364 3.6531,-2.09077 0.39579,-0.84216 1.25891,-2.18904 1.91795,-2.99304 1.48075,-1.80638 2.89866,-4.72745 2.89866,-5.97158 0,-0.75538 0.58238,-1.50827 3.06391,-3.96067 2.7523,-2.72002 6.3045,-6.98689 7.09162,-8.51845 0.1634,-0.318 0.3954,-1.22055 0.51562,-2.00566 0.25722,-1.68064 1.72382,-4.16066 2.46108,-4.16147 0.9766,-10e-4 2.12459,1.22566 2.31255,2.47132 0.0998,0.66067 0.27255,1.72385 0.384,2.36261 0.1155,0.66184 0.0472,1.45181 -0.15868,1.83656 -0.24595,0.45955 -0.25349,0.67517 -0.0229,0.67517 0.51299,0 2.24002,-2.8963 2.24002,-3.75665 0,-0.8354 0.53999,-2.02246 1.08581,-2.38694 0.19334,-0.12906 0.94292,-0.23686 1.66584,-0.23955 1.77381,-0.007 2.99753,0.95517 2.99753,2.35583 0,0.57021 0.21732,1.76868 0.48299,2.66324 l 0.48306,1.6265 0.92969,-0.92972 c 1.22287,-1.22287 2.47045,-1.24866 2.92225,-0.0604 0.22007,0.57891 0.22505,1.10057 0.0151,1.56166 -0.27458,0.60266 -0.20454,0.71514 0.53993,0.86809 1.18369,0.24315 3.55993,2.06175 3.91536,2.99648 0.59574,1.567 0.35077,3.19938 -0.65144,4.34081 -0.94122,1.07196 -0.94371,1.08593 -0.60505,3.28498 0.18712,1.21464 0.38753,2.25901 0.44545,2.32083 0.2451,0.26166 3.313,-0.9897 3.8317,-1.56289 1.62004,-1.79007 4.61934,0.34098 4.61934,3.28202 0,0.59127 -0.10771,1.21358 -0.23953,1.38292 -0.13176,0.16934 0.1309,-0.10749 0.58362,-0.61518 l 0.82309,-0.92308 2.45525,0.57882 c 3.13892,0.74002 4.67982,1.61224 5.4805,3.10222 0.49583,0.92281 0.83285,1.18897 1.50604,1.18964 0.49596,0.001 1.31643,0.39216 1.91637,0.91477 0.57707,0.50266 1.55223,1.17153 2.16717,1.48639 0.61481,0.31487 1.27608,0.78847 1.46955,1.05246 0.39952,0.54529 2.27154,0.59949 2.79024,0.0808 0.66827,-0.66817 2.3398,-0.37712 3.37202,0.58712 0.87138,0.81397 0.99174,1.13441 0.98984,2.63507 -0.007,3.14067 -1.18875,4.18009 -7.03587,6.17196 -3.71253,1.26471 -4.57971,1.44538 -6.93747,1.44538 -2.24861,0 -2.8547,-0.11412 -3.66279,-0.68954 -0.94626,-0.67382 -0.99252,-0.67652 -2.02854,-0.11858 -0.5831,0.31401 -1.383,0.91461 -1.77767,1.33464 l -0.71741,0.76372 1.56061,1.58439 c 1.40266,1.42413 1.61342,1.53657 2.08298,1.11159 0.76662,-0.69377 2.74012,-0.60035 3.50647,0.16598 0.78732,0.78729 0.81648,1.55502 0.0799,2.09925 -0.83901,0.61987 -0.0838,1.18313 1.57667,1.17578 1.61709,-0.007 2.17621,0.35138 2.17621,1.3954 0,0.59148 -0.17166,0.7594 -0.7769,0.7594 -0.48332,0 -0.84989,0.22977 -0.96998,0.60798 -0.26508,0.83534 -2.11417,1.6503 -4.4471,1.96007 -1.90366,0.25276 -5.24254,1.10817 -7.59191,1.94503 -1.09649,0.39058 -1.18265,0.52074 -1.37769,2.08163 -0.25454,2.03716 -0.67941,2.42422 -2.5359,2.31005 -0.79407,-0.0488 -1.53022,-0.002 -1.6359,0.10335 -0.10561,0.10567 0.32091,0.60142 0.94784,1.10167 0.62693,0.50027 1.13993,1.14348 1.13993,1.4294 0,0.28592 0.21555,0.69878 0.47906,0.91747 1.02219,0.84833 0.30092,2.43799 -1.55295,3.4227 -0.52676,0.27977 -0.48306,0.33828 0.3819,0.51126 1.25557,0.25111 1.75716,1.19504 1.48651,2.79737 -0.15363,0.90893 -0.36794,1.2537 -0.77945,1.2537 -1.42926,0 -3.3719,-2.70726 -2.60535,-3.63084 0.50081,-0.60337 -1.57909,-0.86467 -4.87669,-0.61268 -2.37814,0.18174 -2.45709,0.21144 -1.43732,0.54105 0.67928,0.21956 1.25642,0.70374 1.55806,1.30695 0.41505,0.8301 0.62988,0.94551 1.607,0.86325 0.85566,-0.072 1.30196,0.0903 1.84916,0.67285 0.87917,0.9358 1.26172,2.8927 0.69828,3.57163 -0.45639,0.54984 -2.57856,0.65234 -3.08199,0.14886 -0.23101,-0.23099 -0.45619,-0.1844 -0.73549,0.15214 -0.34547,0.41624 -0.19184,0.54147 1.0828,0.88237 2.06555,0.55246 2.84678,1.34484 2.63181,2.66945 -0.12598,0.77608 -0.0111,1.1894 0.4446,1.60189 0.33781,0.30575 0.61514,0.85703 0.61626,1.22506 0,0.40883 0.37665,0.8823 0.9648,1.21704 0.60282,0.34303 1.20761,1.11895 1.61742,2.075045 0.37403,0.87256 1.58191,2.485991 2.81788,3.764031 2.72839,2.82133 3.02053,3.36933 2.75178,5.16167 -0.1765,1.17708 -0.43169,1.57351 -1.52084,2.36249 -0.71977,0.52142 -1.65712,1.46074 -2.08292,2.08735 -0.66074,0.97241 -0.72193,1.26543 -0.41747,2.00042 0.19615,0.47362 1.00666,1.25369 1.80099,1.7335 0.79426,0.47981 1.6716,1.26687 1.94966,1.74904 0.56868,0.98649 2.52869,2.54597 4.42534,3.52103 0.69619,0.35796 1.69715,1.10835 2.22417,1.66754 0.52702,0.55918 1.52124,1.30625 2.2095,1.66012 1.53401,0.78869 4.33814,2.85596 4.33814,3.19814 0,0.64314 2.36392,2.78408 3.29157,2.98114 3.11842,0.66236 2.71293,3.44603 -0.88801,6.09705 l -1.28558,0.94651 -5.32705,-0.0434 c -4.41945,-0.036 -5.46766,-0.13568 -6.15336,-0.58491 -1.12014,-0.734 -3.69123,-1.21344 -3.69123,-0.68833 0,0.88679 -1.22942,1.53613 -2.56839,1.35654 -1.12847,-0.15136 -1.45376,-0.0446 -2.40271,0.78858 -0.60361,0.52999 -1.09747,1.11694 -1.09747,1.30432 0,0.61061 -2.01766,4.84486 -2.64971,5.56065 -0.83547,0.94619 -1.93367,5.6836 -1.50374,6.48688 0.50015,0.93456 0.37973,2.29694 -0.31815,3.59909 -0.77894,1.45317 -0.79106,1.89641 -0.10398,3.81328 0.46,1.28334 0.67568,1.5151 1.48658,1.597 1.48403,0.14992 1.74197,0.90287 0.92798,2.70938 -0.38137,0.84625 -0.78522,2.35688 -0.89764,3.35694 -0.11931,1.06047 -0.42298,2.01508 -0.72888,2.29042 -0.68334,0.61527 -3.70237,1.79849 -4.6086,1.8063 -0.72042,0.007 -3.41815,2.85544 -5.35745,5.65834 -1.05175,1.52015 -2.85327,2.4565 -4.21281,2.18961 -0.75535,-0.14829 -0.87832,-0.0687 -0.87832,0.56857 0,0.91256 -0.75207,1.60008 -2.29008,2.09359 -1.4381,0.46144 -1.7214,0.80341 -1.96204,2.3682 -0.23809,1.54838 -0.68406,2.08325 -2.35507,2.82408 l -1.33701,0.5928 0.77815,0.77808 c 0.69428,0.6944 0.77808,1.05197 0.77808,3.32499 0,1.85231 -0.13241,2.67923 -0.48529,3.03212 -0.43398,0.43402 -0.35818,0.52049 0.71872,0.81954 0.66212,0.18388 1.51875,0.33512 1.9036,0.3361 0.38485,0.001 0.78136,0.13367 0.88094,0.29487 0.25866,0.41856 -0.38281,4.69924 -0.97325,6.49419 l -0.49911,1.51716 -1.65116,-0.001 -1.65116,-10e-4 0.0983,3.6244 0.0984,3.6244 -1.14753,1.00754 c -0.63119,0.55415 -1.34035,1.00754 -1.57601,1.00754 -0.28893,0 -0.47605,0.57495 -0.57491,1.76696 -0.11787,1.42104 -0.33794,1.96816 -1.1244,2.79476 -1.13233,1.19012 -2.96046,4.69205 -2.96046,5.671 0,1.11194 -0.56115,1.80916 -1.6279,2.02253 -0.55663,0.11131 -1.67566,0.67436 -2.48682,1.25124 -1.22006,0.86773 -6.20079,3.10238 -6.91473,3.10238 -0.11119,0 -1.23238,0.43908 -2.49148,0.97576 -1.25917,0.53667 -2.86172,1.21939 -3.56125,1.51716 -0.69952,0.29776 -3.03704,1.4397 -5.19451,2.53764 -2.15747,1.09794 -4.25494,1.99626 -4.66121,1.99626 -0.4062,0 -1.06176,-0.34404 -1.4569,-0.76453 z",
-                fill : "blue"
-            });
+            data: "m 136.68513,236.08861 c -0.63689,-0.67792 -0.75417,-1.28099 -1.03556,-5.32352 -0.26489,-3.80589 -0.4465,-4.81397 -1.09951,-6.1026 -0.51169,-1.00981 -0.98721,-1.54361 -1.375,-1.54361 -0.8911,0 -3.48931,-1.22828 -3.80975,-1.80103 -0.16294,-0.29089 -0.87295,-0.56825 -1.68693,-0.65886 -1.13423,-0.12629 -1.91094,0.0661 -4.02248,0.99633 -4.0367,1.77835 -5.46464,1.87106 -6.79674,0.44127 -0.51948,-0.55765 -0.64763,-1.12674 -0.64763,-2.87683 l 0,-2.18167 -0.87832,0.20996 c -0.48312,0.11549 -1.12041,0.33383 -1.41635,0.4852 -1.52799,0.78172 -4.61534,-0.0398 -5.55846,-1.47906 -0.30603,-0.46718 -1.06518,-1.19501 -1.68667,-1.61739 -1.27136,-0.86387 -1.62607,-0.6501 -1.63439,0.98494 -0.007,1.00822 -0.76687,2.38672 -1.31885,2.38672 -0.17579,0 -1.27182,0.66553 -2.4356,1.47895 -4.016775,2.8076 -6.006455,3.29182 -7.693525,1.87231 -0.52348,-0.44054 -1.43004,-1.00203 -2.01445,-1.24775 -1.35902,-0.57143 -2.10139,-0.21496 -5.36296,2.57523 -2.00259,1.71315 -2.55857,2.02869 -3.57441,2.02869 -0.66172,0 -1.31931,-0.17966 -1.46135,-0.39925 -0.27734,-0.42865 -0.75823,-5.15099 -0.87007,-8.54399 -0.0708,-2.14922 -0.41754,-3.83281 -0.78935,-3.83281 -0.1176,0 -0.45993,0.28746 -0.76078,0.63881 -0.66657,0.77849 -3.4572,0.87321 -4.70537,0.15969 -1.29782,-0.7419 -2.38029,-0.55672 -5.01545,0.85797 -2.16783,1.16385 -2.75945,1.33971 -4.5666,1.35746 -1.66762,0.0163 -2.276,-0.12217 -3.09174,-0.70405 -0.61985,-0.44211 -1.09397,-0.5977 -1.21663,-0.39925 -0.32993,0.53385 -2.25686,0.37294 -2.80642,-0.23436 -0.27856,-0.30774 -0.65658,-0.95453 -0.8401,-1.43731 -0.42448,-1.11632 -0.91809,-1.10316 -3.01531,0.0804 -0.93379,0.52702 -2.13107,0.9582 -2.66054,0.9582 -1.46554,0 -1.97734,-0.82307 -2.19476,-3.52955 -0.10515,-1.30865 -0.4137,-2.90864 -0.68575,-3.55553 -0.37975,-0.90312 -0.41736,-1.39768 -0.16196,-2.13038 0.35544,-1.01957 -0.24711,-3.50377 -1.40121,-5.77657 -0.48023,-0.94578 -0.50724,-1.33822 -0.19445,-2.82926 0.40575,-1.93441 -0.0409,-3.36568 -1.16059,-3.72114 -0.3255,-0.10331 -0.93466,-0.55279 -1.35374,-0.99885 -1.12569,-1.19829 -1.03821,-2.92553 0.22088,-4.35957 0.85079,-0.96896 1.01308,-1.45348 1.2082,-3.60666 l 0.22545,-2.48734 -1.16949,-1.19763 c -0.64324,-0.65869 -1.26203,-1.64897 -1.37517,-2.20061 -0.13388,-0.6528 -0.56813,-1.23242 -1.24372,-1.66009 l -1.03807,-0.65709 0,1.0782 c 0,0.59301 -0.21786,1.38922 -0.48413,1.76937 -0.68007,0.97099 -4.56312,2.96438 -5.77445,2.96438 -1.55729,0 -1.88611,-0.67097 -1.88611,-3.84837 0,-3.52819 0.41663,-4.13666 2.83284,-4.13666 1.49279,0 1.57631,-0.0396 1.09598,-0.51996 -0.4316,-0.43155 -0.69566,-0.4587 -1.55343,-0.15971 -0.56839,0.19815 -1.3354,0.35443 -1.70442,0.34729 -0.86278,-0.0167 -2.61563,-1.51607 -3.02205,-2.58498 -0.3513,-0.92403 -0.12267,-3.38466 0.34119,-3.67132 0.16474,-0.1018 -0.39367,-0.50661 -1.24085,-0.89959 -2.032471,-0.94281 -2.321421,-1.35146 -2.487701,-3.51839 -0.0772,-1.00533 -0.30119,-2.31552 -0.4979,-2.91152 -0.48076,-1.45668 -0.16499,-2.30832 0.90163,-2.43139 0.843711,-0.0974 0.860511,-0.14171 0.748911,-1.97594 -0.0696,-1.14269 0.0236,-1.96143 0.23793,-2.09396 0.47223,-0.29188 -2.501621,-3.97433 -3.330171,-4.12358 -0.34456,-0.062 -0.75956,-0.23921 -0.92229,-0.39365 -0.3459,-0.32835 -0.78945,-2.83658 -0.98794,-5.58637 -0.0769,-1.06517 -0.35848,-2.55647 -0.62576,-3.31402 -0.71739,-2.03331 -0.61465,-2.55112 0.76687,-3.86532 l 1.25273,-1.19173 -0.46915,-1.36178 c -0.53343,-1.54826 -0.33638,-2.99085 0.48923,-3.5815 0.65547,-0.46898 1.32731,-2.61652 1.52388,-4.87126 0.13191,-1.51252 0.2658,-1.7153 2.531131,-3.83281 2.21127,-2.06705 2.41106,-2.36144 2.64687,-3.89989 0.31881,-2.07979 0.74608,-2.60075 2.34208,-2.85597 0.69615,-0.11132 1.66359,-0.53718 2.14988,-0.94636 1.89204,-1.59201 4.16695,-1.77416 4.16695,-0.33363 0,0.40454 -0.23171,1.4157 -0.51499,2.24703 -0.28322,0.83134 -0.45486,1.57164 -0.38139,1.64512 0.0735,0.0735 1.32057,0.92807 2.77127,1.89909 2.57827,1.72574 2.68847,1.7655 4.89522,1.7655 1.74495,0 2.50706,-0.15424 3.35669,-0.67937 0.91121,-0.56315 1.2344,-0.61779 1.88934,-0.3194 0.43449,0.19798 1.19684,0.35997 1.69411,0.35997 1.03354,0 1.51204,0.45563 1.67033,1.59058 0.10938,0.78459 0.54215,1.02641 2.56344,1.43244 0.47079,0.0946 1.07249,0.38843 1.33713,0.65302 0.29826,0.29829 0.55659,0.35879 0.67998,0.15922 0.3007,-0.48659 2.51019,-0.38548 3.21433,0.1471 0.90129,0.6817 0.99638,0.6211 1.2201,-0.77786 0.1114,-0.69691 0.4878,-1.53284 0.83642,-1.85761 0.34861,-0.32477 0.76943,-1.29968 0.93532,-2.16645 0.36198,-1.89196 1.67658,-4.95214 2.37708,-5.53353 0.45941,-0.38127 0.45882,-0.50661 -0.007,-1.40586 -0.92929,-1.79695 -1.07762,-2.78281 -0.59325,-3.94207 0.32267,-0.77223 0.71393,-1.13742 1.3562,-1.26589 l 0.90282,-0.18055 -0.12723,-3.168 -0.1273,-3.168021 1.13626,0 c 0.6249,0 1.22425,0.14254 1.33189,0.31676 0.11034,0.17851 0.92013,-0.22348 1.85538,-0.92103 2.57554,-1.920815 3.6054,-2.317745 6.74013,-2.597735 2.80648,-0.25066 4.59942,-0.61535 8.65387,-1.76019 1.05398,-0.29761 2.49129,-0.66582 3.19396,-0.81822 2.5583,-0.55486 5.16562,-1.18239 7.665675,-1.84504 2.13376,-0.56557 2.7297,-0.87493 3.61346,-1.87587 1.968,-2.22882 6.60136,-8.28119 7.54474,-9.85529 0.55323,-0.92329 1.87182,-2.29956 3.218,-3.35904 2.58733,-2.03622 6.23997,-6.36804 7.37413,-8.74536 0.64823,-1.35877 0.73216,-1.8923 0.56253,-3.57654 -0.2316,-2.3005 -0.44696,-2.16353 3.91929,-2.49301 3.85817,-0.29115 6.65679,-1.49266 9.77494,-4.19656 2.99721,-2.5991 5.77546,-4.25711 7.14234,-4.26265 1.34414,-0.005 2.18866,0.95864 1.93792,2.21228 l -0.19117,0.956 1.02783,-0.62674 c 0.66237,-0.40384 1.60221,-0.62716 2.64269,-0.62793 1.73168,-10e-4 3.01752,-0.70122 4.31246,-2.34742 0.89476,-1.13744 0.70339,-1.77317 -0.78398,-2.60556 -0.68465,-0.38314 -1.52661,-1.0834 -1.87097,-1.55613 -0.54929,-0.75408 -0.57635,-0.97959 -0.22059,-1.83856 0.52649,-1.27114 3.93115,-4.11017 4.92904,-4.11017 0.41859,0 1.13672,0.14279 1.59566,0.3173 1.3868,0.52725 2.80354,-0.28364 3.6531,-2.09077 0.39579,-0.84216 1.25891,-2.18904 1.91795,-2.99304 1.48075,-1.80638 2.89866,-4.72745 2.89866,-5.97158 0,-0.75538 0.58238,-1.50827 3.06391,-3.96067 2.7523,-2.72002 6.3045,-6.98689 7.09162,-8.51845 0.1634,-0.318 0.3954,-1.22055 0.51562,-2.00566 0.25722,-1.68064 1.72382,-4.16066 2.46108,-4.16147 0.9766,-10e-4 2.12459,1.22566 2.31255,2.47132 0.0998,0.66067 0.27255,1.72385 0.384,2.36261 0.1155,0.66184 0.0472,1.45181 -0.15868,1.83656 -0.24595,0.45955 -0.25349,0.67517 -0.0229,0.67517 0.51299,0 2.24002,-2.8963 2.24002,-3.75665 0,-0.8354 0.53999,-2.02246 1.08581,-2.38694 0.19334,-0.12906 0.94292,-0.23686 1.66584,-0.23955 1.77381,-0.007 2.99753,0.95517 2.99753,2.35583 0,0.57021 0.21732,1.76868 0.48299,2.66324 l 0.48306,1.6265 0.92969,-0.92972 c 1.22287,-1.22287 2.47045,-1.24866 2.92225,-0.0604 0.22007,0.57891 0.22505,1.10057 0.0151,1.56166 -0.27458,0.60266 -0.20454,0.71514 0.53993,0.86809 1.18369,0.24315 3.55993,2.06175 3.91536,2.99648 0.59574,1.567 0.35077,3.19938 -0.65144,4.34081 -0.94122,1.07196 -0.94371,1.08593 -0.60505,3.28498 0.18712,1.21464 0.38753,2.25901 0.44545,2.32083 0.2451,0.26166 3.313,-0.9897 3.8317,-1.56289 1.62004,-1.79007 4.61934,0.34098 4.61934,3.28202 0,0.59127 -0.10771,1.21358 -0.23953,1.38292 -0.13176,0.16934 0.1309,-0.10749 0.58362,-0.61518 l 0.82309,-0.92308 2.45525,0.57882 c 3.13892,0.74002 4.67982,1.61224 5.4805,3.10222 0.49583,0.92281 0.83285,1.18897 1.50604,1.18964 0.49596,0.001 1.31643,0.39216 1.91637,0.91477 0.57707,0.50266 1.55223,1.17153 2.16717,1.48639 0.61481,0.31487 1.27608,0.78847 1.46955,1.05246 0.39952,0.54529 2.27154,0.59949 2.79024,0.0808 0.66827,-0.66817 2.3398,-0.37712 3.37202,0.58712 0.87138,0.81397 0.99174,1.13441 0.98984,2.63507 -0.007,3.14067 -1.18875,4.18009 -7.03587,6.17196 -3.71253,1.26471 -4.57971,1.44538 -6.93747,1.44538 -2.24861,0 -2.8547,-0.11412 -3.66279,-0.68954 -0.94626,-0.67382 -0.99252,-0.67652 -2.02854,-0.11858 -0.5831,0.31401 -1.383,0.91461 -1.77767,1.33464 l -0.71741,0.76372 1.56061,1.58439 c 1.40266,1.42413 1.61342,1.53657 2.08298,1.11159 0.76662,-0.69377 2.74012,-0.60035 3.50647,0.16598 0.78732,0.78729 0.81648,1.55502 0.0799,2.09925 -0.83901,0.61987 -0.0838,1.18313 1.57667,1.17578 1.61709,-0.007 2.17621,0.35138 2.17621,1.3954 0,0.59148 -0.17166,0.7594 -0.7769,0.7594 -0.48332,0 -0.84989,0.22977 -0.96998,0.60798 -0.26508,0.83534 -2.11417,1.6503 -4.4471,1.96007 -1.90366,0.25276 -5.24254,1.10817 -7.59191,1.94503 -1.09649,0.39058 -1.18265,0.52074 -1.37769,2.08163 -0.25454,2.03716 -0.67941,2.42422 -2.5359,2.31005 -0.79407,-0.0488 -1.53022,-0.002 -1.6359,0.10335 -0.10561,0.10567 0.32091,0.60142 0.94784,1.10167 0.62693,0.50027 1.13993,1.14348 1.13993,1.4294 0,0.28592 0.21555,0.69878 0.47906,0.91747 1.02219,0.84833 0.30092,2.43799 -1.55295,3.4227 -0.52676,0.27977 -0.48306,0.33828 0.3819,0.51126 1.25557,0.25111 1.75716,1.19504 1.48651,2.79737 -0.15363,0.90893 -0.36794,1.2537 -0.77945,1.2537 -1.42926,0 -3.3719,-2.70726 -2.60535,-3.63084 0.50081,-0.60337 -1.57909,-0.86467 -4.87669,-0.61268 -2.37814,0.18174 -2.45709,0.21144 -1.43732,0.54105 0.67928,0.21956 1.25642,0.70374 1.55806,1.30695 0.41505,0.8301 0.62988,0.94551 1.607,0.86325 0.85566,-0.072 1.30196,0.0903 1.84916,0.67285 0.87917,0.9358 1.26172,2.8927 0.69828,3.57163 -0.45639,0.54984 -2.57856,0.65234 -3.08199,0.14886 -0.23101,-0.23099 -0.45619,-0.1844 -0.73549,0.15214 -0.34547,0.41624 -0.19184,0.54147 1.0828,0.88237 2.06555,0.55246 2.84678,1.34484 2.63181,2.66945 -0.12598,0.77608 -0.0111,1.1894 0.4446,1.60189 0.33781,0.30575 0.61514,0.85703 0.61626,1.22506 0,0.40883 0.37665,0.8823 0.9648,1.21704 0.60282,0.34303 1.20761,1.11895 1.61742,2.075045 0.37403,0.87256 1.58191,2.485991 2.81788,3.764031 2.72839,2.82133 3.02053,3.36933 2.75178,5.16167 -0.1765,1.17708 -0.43169,1.57351 -1.52084,2.36249 -0.71977,0.52142 -1.65712,1.46074 -2.08292,2.08735 -0.66074,0.97241 -0.72193,1.26543 -0.41747,2.00042 0.19615,0.47362 1.00666,1.25369 1.80099,1.7335 0.79426,0.47981 1.6716,1.26687 1.94966,1.74904 0.56868,0.98649 2.52869,2.54597 4.42534,3.52103 0.69619,0.35796 1.69715,1.10835 2.22417,1.66754 0.52702,0.55918 1.52124,1.30625 2.2095,1.66012 1.53401,0.78869 4.33814,2.85596 4.33814,3.19814 0,0.64314 2.36392,2.78408 3.29157,2.98114 3.11842,0.66236 2.71293,3.44603 -0.88801,6.09705 l -1.28558,0.94651 -5.32705,-0.0434 c -4.41945,-0.036 -5.46766,-0.13568 -6.15336,-0.58491 -1.12014,-0.734 -3.69123,-1.21344 -3.69123,-0.68833 0,0.88679 -1.22942,1.53613 -2.56839,1.35654 -1.12847,-0.15136 -1.45376,-0.0446 -2.40271,0.78858 -0.60361,0.52999 -1.09747,1.11694 -1.09747,1.30432 0,0.61061 -2.01766,4.84486 -2.64971,5.56065 -0.83547,0.94619 -1.93367,5.6836 -1.50374,6.48688 0.50015,0.93456 0.37973,2.29694 -0.31815,3.59909 -0.77894,1.45317 -0.79106,1.89641 -0.10398,3.81328 0.46,1.28334 0.67568,1.5151 1.48658,1.597 1.48403,0.14992 1.74197,0.90287 0.92798,2.70938 -0.38137,0.84625 -0.78522,2.35688 -0.89764,3.35694 -0.11931,1.06047 -0.42298,2.01508 -0.72888,2.29042 -0.68334,0.61527 -3.70237,1.79849 -4.6086,1.8063 -0.72042,0.007 -3.41815,2.85544 -5.35745,5.65834 -1.05175,1.52015 -2.85327,2.4565 -4.21281,2.18961 -0.75535,-0.14829 -0.87832,-0.0687 -0.87832,0.56857 0,0.91256 -0.75207,1.60008 -2.29008,2.09359 -1.4381,0.46144 -1.7214,0.80341 -1.96204,2.3682 -0.23809,1.54838 -0.68406,2.08325 -2.35507,2.82408 l -1.33701,0.5928 0.77815,0.77808 c 0.69428,0.6944 0.77808,1.05197 0.77808,3.32499 0,1.85231 -0.13241,2.67923 -0.48529,3.03212 -0.43398,0.43402 -0.35818,0.52049 0.71872,0.81954 0.66212,0.18388 1.51875,0.33512 1.9036,0.3361 0.38485,0.001 0.78136,0.13367 0.88094,0.29487 0.25866,0.41856 -0.38281,4.69924 -0.97325,6.49419 l -0.49911,1.51716 -1.65116,-0.001 -1.65116,-10e-4 0.0983,3.6244 0.0984,3.6244 -1.14753,1.00754 c -0.63119,0.55415 -1.34035,1.00754 -1.57601,1.00754 -0.28893,0 -0.47605,0.57495 -0.57491,1.76696 -0.11787,1.42104 -0.33794,1.96816 -1.1244,2.79476 -1.13233,1.19012 -2.96046,4.69205 -2.96046,5.671 0,1.11194 -0.56115,1.80916 -1.6279,2.02253 -0.55663,0.11131 -1.67566,0.67436 -2.48682,1.25124 -1.22006,0.86773 -6.20079,3.10238 -6.91473,3.10238 -0.11119,0 -1.23238,0.43908 -2.49148,0.97576 -1.25917,0.53667 -2.86172,1.21939 -3.56125,1.51716 -0.69952,0.29776 -3.03704,1.4397 -5.19451,2.53764 -2.15747,1.09794 -4.25494,1.99626 -4.66121,1.99626 -0.4062,0 -1.06176,-0.34404 -1.4569,-0.76453 z",
+            fill: "blue"
+        });
         layer.add(borneo);
         stage.add(layer);
     }