diff --git a/build/goo.min.js b/build/goo.min.js
index ba106aa..0b06833 100644
--- a/build/goo.min.js
+++ b/build/goo.min.js
@@ -1,7 +1,6 @@
-var Goo=function(e){function h(){if(a.fullscreen){var b=window.innerWidth,c=window.innerHeight;a.canvas.width!=b&&(a.canvas.width=b);a.canvas.height!=c&&(a.canvas.height=c)}b=k();if(a.onDraw)a.onDraw(a,b);if(a.animate){if(60<f++){a.fps=1E3*(f/(b-l));if(a.onFrameRate)a.onFrameRate(a);f=0;l=b}m(h)}}var a=this;a.type="2d";a.animate=!0;a.fullscreen=!1;a.keysDown={};a.userData={};if(e)for(var g in e)e.hasOwnProperty(g)&&(a[g]=e[g]);a.canvas=document.createElement("canvas");a.canvas&&(a.ctx=a.canvas.getContext(a.type));
-if(!a.canvas||!a.ctx&&a.onFailure)a.onFailure();else{a.canvas.width=a.width;a.canvas.height=a.height;a.__defineGetter__&&a.__defineSetter__?(a.__defineGetter__("width",function(){return a.canvas.width}),a.__defineSetter__("width",function(b){a.canvas.width=b}),a.__defineGetter__("height",function(){return a.canvas.height}),a.__defineSetter__("height",function(b){a.canvas.height=b})):Object.defineProperty&&(Object.defineProperty(a,"width",{get:function(){return a.canvas.width},set:function(b){a.canvas.width=
-b}}),Object.defineProperty(a,"height",{get:function(){return a.canvas.height},set:function(b){a.canvas.height=b}}));a.fullscreen&&(a.container=document.body,document.body.style.margin="0px",document.body.style.padding="0px",document.body.style.overflow="hidden");a.container&&a.container.appendChild(a.canvas);var m=function(){var a=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame;a||(a=function(a){window.setTimeout(a,
-1E3/30)});return a}(),k=Date.now?Date.now:function(){return(new Date).getTime()};a.updateMouse=function(a,c){for(var d=this.canvas;d;)c-=d.offsetTop,a-=d.offsetLeft,d=d.offsetParent;this.prevMouseX=this.mouseX;this.prevMouseY=this.mouseY;this.mouseX=a;this.mouseY=c};document.addEventListener("mousedown",function(b){if(b.target==a.canvas){a.updateMouse(b.pageX,b.pageY);if(a.onMouseDown)a.onMouseDown(a);a.dragging=!0}},!1);document.addEventListener("mouseup",function(b){if(a.dragging){a.updateMouse(b.pageX,
-b.pageY);if(a.onMouseUp)a.onMouseUp(a);a.dragging=!1}},!1);document.addEventListener("mousemove",function(b){a.updateMouse(b.pageX,b.pageY);if(a.mouseX!=a.prevMouseX||a.mouseY!=a.prevMouseY)if(a.dragging&&a.onMouseDrag)a.onMouseDrag(a);else if(a.onMouseMove&&b.target==a.canvas)a.onMouseMove(a)},!1);document.addEventListener("touchstart",function(b){if(b.target==a.canvas){a.updateMouse(b.pageX,b.pageY);if(a.onMouseDown)a.onMouseDown(a);a.dragging=!0}},!1);document.addEventListener("touchend",function(b){if(a.onMouseUp)a.onMouseUp(a);
-a.dragging=!1},!1);document.addEventListener("touchmove",function(b){a.dragging&&(a.updateMouse(b.pageX,b.pageY),a.onMouseDrag(a),b.preventDefault())},!1);document.addEventListener("click",function(b){a.updateMouse(b.pageX,b.pageY);if(a.onMouseClick)a.onMouseClick(a)},!1);document.addEventListener("keydown",function(b){a.keyCode=b.keyCode;a.key=String.fromCharCode(a.keyCode);a.keysDown[a.keyCode]=!0;if(a.onKeyDown)a.onKeyDown(a)},!1);document.addEventListener("keyup",function(b){a.keyCode=b.keyCode;
-a.key=String.fromCharCode(a.keyCode);delete a.keysDown[a.keyCode];if(a.onKeyUp)a.onKeyUp(a)},!1);document.addEventListener("keypress",function(b){a.keyCode=b.keyCode;a.key=String.fromCharCode(a.keyCode);if(a.onKeyPress)a.onKeyPress(a)},!1);var f=0,l=k();m(h)}};
+var Goo=function(e){function h(b){if(a.fullscreen){var d=window.innerWidth,c=window.innerHeight;a.canvas.width!=d&&(a.canvas.width=d);a.canvas.height!=c&&(a.canvas.height=c)}if(a.onDraw)a.onDraw(a,b);if(a.animate){if(60<f++){a.fps=f/(b-k)*1E3;if(a.onFrameRate)a.onFrameRate(a);f=0;k=b}l(h)}}var a=this;a.type="2d";a.animate=!0;a.fullscreen=!1;a.keysDown={};a.userData={};if(e)for(var g in e)e.hasOwnProperty(g)&&(a[g]=e[g]);a.canvas=document.createElement("canvas");a.canvas&&(a.ctx=a.canvas.getContext(a.type));
+if(!a.canvas||!a.ctx&&a.onFailure)a.onFailure();else{a.canvas.width=a.width;a.canvas.height=a.height;Object.defineProperty&&(Object.defineProperty(a,"width",{get:function(){return a.canvas.width},set:function(b){a.canvas.width=b}}),Object.defineProperty(a,"height",{get:function(){return a.canvas.height},set:function(b){a.canvas.height=b}}));a.fullscreen&&(a.container=document.body,document.body.style.margin="0px",document.body.style.padding="0px",document.body.style.overflow="hidden");a.container&&
+a.container.appendChild(a.canvas);var l=function(){var a=window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame;a||(a=function(a){window.setTimeout(a,1E3/30,Date.now())});return a}();a.updateMouse=function(a,d){for(var c=this.canvas;c;)d-=c.offsetTop,a-=c.offsetLeft,c=c.offsetParent;this.prevMouseX=this.mouseX;this.prevMouseY=this.mouseY;this.mouseX=a;this.mouseY=d};document.addEventListener("mousedown",
+function(b){if(b.target==a.canvas){a.updateMouse(b.pageX,b.pageY);if(a.onMouseDown)a.onMouseDown(a);a.dragging=!0}},!1);document.addEventListener("mouseup",function(b){if(a.dragging){a.updateMouse(b.pageX,b.pageY);if(a.onMouseUp)a.onMouseUp(a);a.dragging=!1}},!1);document.addEventListener("mousemove",function(b){a.updateMouse(b.pageX,b.pageY);if(a.mouseX!=a.prevMouseX||a.mouseY!=a.prevMouseY)if(a.dragging&&a.onMouseDrag)a.onMouseDrag(a);else if(a.onMouseMove&&b.target==a.canvas)a.onMouseMove(a)},
+!1);document.addEventListener("touchstart",function(b){if(b.target==a.canvas){a.updateMouse(b.pageX,b.pageY);if(a.onMouseDown)a.onMouseDown(a);a.dragging=!0}},!1);document.addEventListener("touchend",function(b){if(a.onMouseUp)a.onMouseUp(a);a.dragging=!1},!1);document.addEventListener("touchmove",function(b){a.dragging&&(a.updateMouse(b.pageX,b.pageY),a.onMouseDrag(a),b.preventDefault())},!1);document.addEventListener("click",function(b){a.updateMouse(b.pageX,b.pageY);if(a.onMouseClick)a.onMouseClick(a)},
+!1);document.addEventListener("keydown",function(b){a.keyCode=b.keyCode;a.key=String.fromCharCode(a.keyCode);a.keysDown[a.keyCode]=!0;if(a.onKeyDown)a.onKeyDown(a)},!1);document.addEventListener("keyup",function(b){a.keyCode=b.keyCode;a.key=String.fromCharCode(a.keyCode);delete a.keysDown[a.keyCode];if(a.onKeyUp)a.onKeyUp(a)},!1);document.addEventListener("keypress",function(b){a.keyCode=b.keyCode;a.key=String.fromCharCode(a.keyCode);if(a.onKeyPress)a.onKeyPress(a)},!1);var f=0,k=Date.now();l(h)}};
diff --git a/src/goo.js b/src/goo.js
index cb65801..de60cc0 100644
--- a/src/goo.js
+++ b/src/goo.js
@@ -30,22 +30,7 @@ var Goo = function(o) {
   self.canvas.width = self.width;
   self.canvas.height = self.height;
 
-  if (self.__defineGetter__ && self.__defineSetter__) { 
-    self.__defineGetter__("width", function() {
-      return self.canvas.width;
-    });       
-    self.__defineSetter__("width", function(v) {
-      self.canvas.width = v;
-    });
-
-    self.__defineGetter__("height", function() {    
-      return self.canvas.height;
-    });       
-    self.__defineSetter__("height", function(v) {
-      self.canvas.height = v;
-    });
-  }
-  else if (Object.defineProperty) {  // Try the IE way
+  if (Object.defineProperty) {
     Object.defineProperty(self, "width", {
       get: function() {
         return self.canvas.width;
@@ -80,15 +65,12 @@ var Goo = function(o) {
     var rAF = window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame;
     if (!rAF) {
       rAF = function (callback) {
-        window.setTimeout(callback, 1000 / 30.0);
+        window.setTimeout(callback, 1000 / 30.0, Date.now());
       };
     }
     return rAF;
   })();
 
-  var getTick = Date.now?Date.now: function () {
-      return new Date().getTime();
-    }
 
   self.updateMouse = function(x, y) {
     var self = this;
@@ -200,11 +182,10 @@ var Goo = function(o) {
   });
   
   var fpsCounter = 0;
-  var fpsStartTime = getTick();
+  var fpsStartTime = Date.now();
   
-  function update() {
+  function update(tick) {
     sizeCanvas();
-    var tick = getTick();
     if (self.onDraw) 
       self.onDraw(self, tick);
     if (self.animate) {