diff --git a/build/d3d.js b/build/d3d.js
index 98775db..b744a11 100644
--- a/build/d3d.js
+++ b/build/d3d.js
@@ -644,7 +644,49 @@ D3D.Paths.prototype.scaleDown = function (factor) {
 
 	return this;
 };
+D3D.Paths.prototype.optimizePath = function (start) {
+	"use strict";
+
+	var optimizedPaths = new D3D.Paths();
+
+	while (optimizedPaths.length !== this.length) {
+		var minLength = undefined;
+		var reverse;
+		var minPath;
+
+		for (var i = 0; i < this.length; i ++) {
+			var path = this[i];
+
+			if (optimizedPaths.indexOf(path) === -1) {
+				var startPoint = new THREE.Vector2(path[0].X, path[0].Y);
+				var endPoint = new THREE.Vector2(path[path.length - 1].X, path[path.length - 1].Y);
+				var length = startPoint.sub(start).length();
+				if (minLength === undefined || length < minLength) {
+					minPath = path;
+					minLength = length;
+					reverse = false;
+				}
+				var length = endPoint.sub(start).length();
+				if (length < minLength) {
+					minPath = path;
+					minLength = length;
+					reverse = true;
+				}
+			}
+		}
+
+		if (reverse) {
+			minPath.reverse();	
+		}
+		var point = minPath[minPath.length - 1];
+		start = new THREE.Vector2(point.X, point.Y);
+		optimizedPaths.push(minPath);
+	}
+
+	return optimizedPaths;
+};
 D3D.Paths.prototype.tresholdArea = function (minArea) {
+	//code not tested yet
 	"use strict";
 
 	for (var i = 0; i < this.length; i ++) {
@@ -660,11 +702,6 @@ D3D.Paths.prototype.tresholdArea = function (minArea) {
 	
 	return areas;
 };
-D3D.Paths.prototype.area = function () {
-	"use strict";
-
-	return ClipperLib.Clipper.Area(this);
-};
 D3D.Paths.prototype.join = function (path) {
 	"use strict";
 
@@ -684,13 +721,6 @@ D3D.Paths.prototype.bounds = function () {
 
 	return ClipperLib.Clipper.GetBounds(this);
 };
-D3D.Paths.prototype.reverse = function () {
-	"use strict";
-
-	ClipperLib.Clipper.ReversePaths(this);
-
-	return this;
-};
 D3D.Paths.prototype.draw = function (context, color) {
 	"use strict";
 
@@ -698,6 +728,9 @@ D3D.Paths.prototype.draw = function (context, color) {
 	for (var i = 0; i < this.length; i ++) {
 		var shape = this[i];
 
+		//var point = shape[0];
+		//context.fillText(i, point.X*2, point.Y*2);
+
 		context.beginPath();
 		var length = this.closed ? (shape.length + 1) : shape.length;
 		for (var j = 0; j < length; j ++) {
@@ -947,7 +980,12 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 	var data = [];
 
-	var lowFillTemplate = this.getFillTemplate(dimensionsZ, fillSize, true, true);
+	var lowFillTemplate = this.getFillTemplate({
+		left: 0, 
+		top: 0, 
+		right: dimensionsZ, 
+		bottom: dimensionsZ
+	}, fillSize, true, true);
 
 	for (var layer = 0; layer < slices.length; layer ++) {
 		var slice = slices[layer];
@@ -955,14 +993,14 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 		var layerData = [];
 		data.push(layerData);
 		
-		var downSkin = new D3D.Paths();
+		var downSkin = new D3D.Paths([], true);
 		if (layer - skinCount >= 0) {
 			var downLayer = slices[layer - skinCount];
 			for (var i = 0; i < downLayer.length; i ++) {
 				downSkin.join(downLayer[i]);
 			}
 		}
-		var upSkin = new D3D.Paths();
+		var upSkin = new D3D.Paths([], true);
 		if (layer + skinCount < slices.length) {
 			var downLayer = slices[layer + skinCount];
 			for (var i = 0; i < downLayer.length; i ++) {
@@ -978,7 +1016,7 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 			var outerLayer = part.clone();
 			outerLayer.scaleUp(scale);
 
-			var insets = new D3D.Paths();
+			var insets = new D3D.Paths([], true);
 			for (var offset = wallThickness; offset <= shellThickness; offset += wallThickness) {
 				var inset = outerLayer.offset(-offset);
 
@@ -991,12 +1029,19 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 			var lowFillArea = fillArea.difference(highFillArea);
 
-			var fill = new D3D.Paths([]);
+			var fill = new D3D.Paths([], false);
 
 			fill.join(lowFillTemplate.intersect(lowFillArea));
 
-			var highFillTemplate = this.getFillTemplate(dimensionsZ, wallThickness, (layer % 2 === 0), (layer % 2 === 1));
-			fill.join(highFillTemplate.intersect(highFillArea));
+			if (highFillArea.length > 0) {
+				var highFillTemplate = this.getFillTemplate(highFillArea.bounds(), wallThickness, (layer % 2 === 0), (layer % 2 === 1));
+				fill.join(highFillTemplate.intersect(highFillArea));
+			}
+
+			var lastPath = insets[insets.length - 1];
+			var lastPoint = lastPath[lastPath.length - 1];
+			var start = new THREE.Vector2(lastPoint.X, lastPoint.Y);
+			fill = fill.optimizePath(start);			
 
 			layerData.push({
 				outerLayer: outerLayer.scaleDown(scale),
@@ -1008,19 +1053,19 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 	return data;
 };
-D3D.Slicer.prototype.getFillTemplate = function (dimension, size, even, uneven) {
+D3D.Slicer.prototype.getFillTemplate = function (bounds, size, even, uneven) {
 	"use strict";
 
 	var paths = new D3D.Paths([], false);
 
 	if (even) {
-		for (var length = 0; length <= dimension; length += size) {
-			paths.push([{X: length, Y: 0}, {X: length, Y: dimension}]);
+		for (var length = Math.floor(bounds.left); length <= Math.ceil(bounds.right); length += size) {
+			paths.push([{X: length, Y: bounds.top}, {X: length, Y: bounds.bottom}]);
 		}
 	}
 	if (uneven) {
-		for (var length = 0; length <= dimension; length += size) {
-			paths.push([{X: 0, Y: length}, {X: dimension, Y: length}]);
+		for (var length = Math.floor(bounds.top); length <= Math.floor(bounds.bottom); length += size) {
+			paths.push([{X: bounds.left, Y: length}, {X: bounds.right, Y: length}]);
 		}
 	}
 	
diff --git a/build/d3d.min.js b/build/d3d.min.js
index aad9a10..0411b1c 100644
--- a/build/d3d.min.js
+++ b/build/d3d.min.js
@@ -1 +1 @@
-function sendAPI(t,e,i){"use strict";$.ajax({url:t,type:"POST",data:e,dataType:"json",timeout:1e4,success:function(t){"success"===t.status?void 0!==i&&i(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),sendAPI(t,e,i)})}function getAPI(t,e){"use strict";$.ajax({url:t,dataType:"json",timeout:5e3,success:function(t){"success"===t.status?void 0!==e&&e(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),getAPI(t,e)})}function downloadFile(t,e){"use strict";$(document.createElement("a")).attr({download:t,href:"data:text/plain,"+e})[0].click()}var D3D={version:"0.1",website:"http://www.doodle3d.com/",contact:"develop@doodle3d.com"};THREE.Vector2.prototype.normal=function(){"use strict";var t=this.y,e=-this.x;return this.set(t,e)},Array.prototype.clone=function(){"use strict";for(var t=[],e=0;e<this.length;e++)t[e]=this[e];return t},D3D.Box=function(t){"use strict";var e=this;this.batchSize=512,this.maxBufferedLines=4096,this.localIp=t,this.api="http://"+t+"/d3dapi/",this.config={},this.printBatches=[],this.currentBatch=0,this.loaded=!1,this.getConfigAll(function(t){e.updateConfig(t),e.printer=new D3D.Printer(t),e.update(),e.loaded=!0,void 0!==e.onload&&e.onload()})},D3D.Box.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("doodle3d")&&(this.config[e]=t[e]);return this},D3D.Box.prototype.update=function(){"use strict";this.printBatches.length>0&&this.printer.status.buffered_lines+this.batchSize<=this.maxBufferedLines?this.printBatch():this.updateState()},D3D.Box.prototype.updateState=function(){"use strict";var t=this;this.getInfoStatus(function(e){t.printer.status=e,void 0!==t.onupdate&&t.onupdate(e),t.update()})},D3D.Box.prototype.print=function(t){"use strict";for(this.currentBatch=0,t=t.clone();t.length>0;){var e=t.splice(0,Math.min(this.batchSize,t.length));this.printBatches.push(e)}return this},D3D.Box.prototype.printBatch=function(){"use strict";var t=this,e=this.printBatches.shift();this.setPrinterPrint({start:0===this.currentBatch?!0:!1,first:0===this.currentBatch?!0:!1,gcode:e.join("\n")},function(e){console.log("batch sent: "+t.currentBatch,e),t.printBatches.length>0&&t.currentBatch++,t.updateState()})},D3D.Box.prototype.stopPrint=function(){"use strict";this.printBatches=[],this.currentBatch=0;var t=["M107 ;fan off","G91 ;relative positioning","G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure","G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more","G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way","M84 ;disable axes / steppers","G90 ;absolute positioning","M104 S180",";M140 S70","M117 Done                 ;display message (20 characters to clear whole screen)"];return this.setPrinterStop({gcode:t.join("\n")},function(t){console.log("Printer stop command sent")}),this},D3D.Box.prototype.getConfig=function(t,e){"use strict";return getAPI(this.api+"config/?"+t.join("=&")+"=",e),this},D3D.Box.prototype.getConfigAll=function(t){"use strict";return getAPI(this.api+"config/all",t),this},D3D.Box.prototype.setConfig=function(t,e){"use strict";var i=this;return sendAPI(this.api+"config",t,function(r){for(var n in r.validation)"ok"!==r.validation[n]&&delete t[n];i.updateConfig(t),i.printer.updateConfig(t),void 0!==e&&e(r)}),this},D3D.Box.prototype.getInfo=function(t){"use strict";return getAPI(this.api+"info",t),this},D3D.Box.prototype.getInfoStatus=function(t){"use strict";return getAPI(this.api+"info/status",t),this},D3D.Box.prototype.downloadInfoLogFiles=function(){"use strict";window.location=this.api+"info/logfiles"},D3D.Box.prototype.getInfoAcces=function(t){"use strict";return getAPI(this.api+"info/access",t),this},D3D.Box.prototype.getNetworkScan=function(t){"use strict";return getAPI(this.api+"network/scan",t),this},D3D.Box.prototype.getNetworkKnown=function(t){"use strict";return getAPI(this.api+"network/known",t),this},D3D.Box.prototype.getNetworkStatus=function(t){"use strict";return getAPI(this.api+"network/status",t),this},D3D.Box.prototype.setNetworkAssosiate=function(t,e){"use strict";return sendAPI(this.api+"network/associate",t,e),this},D3D.Box.prototype.setNetworkDisassosiate=function(t){"use strict";return sendAPI(this.api+"network/disassociate",{},t),this},D3D.Box.prototype.setNetworkOpenAP=function(t){"use strict";return sendAPI(this.api+"network/openap",{},t),this},D3D.Box.prototype.setNetworkRemove=function(t,e){"use strict";return sendAPI(this.api+"network/remove",{ssid:t},e),this},D3D.Box.prototype.getNetworkSignin=function(t){"use strict";return getAPI(this.api+"network/signin",t),this},D3D.Box.prototype.getNetworkAlive=function(t){"use strict";return getAPI(this.api+"network/alive",t),this},D3D.Box.prototype.getPrinterTemperature=function(t){"use strict";return getAPI(this.api+"printer/temperature",t),this},D3D.Box.prototype.getPrinterProgress=function(t){"use strict";return getAPI(this.api+"printer/progress",t),this},D3D.Box.prototype.getPrinterState=function(t){"use strict";return getAPI(this.api+"printer/state",t),this},D3D.Box.prototype.getPrinterListAll=function(t){"use strict";return getAPI(this.api+"printer/listall",t),this},D3D.Box.prototype.setPrinterHeatup=function(t){"use strict";return sendAPI(this.api+"printer/heatup",{},t),this},D3D.Box.prototype.setPrinterPrint=function(t,e){"use strict";return sendAPI(this.api+"printer/print",t,e),this},D3D.Box.prototype.setPrinterStop=function(t,e){"use strict";return sendAPI(this.api+"printer/stop",t,e),this},D3D.Box.prototype.getSketch=function(t,e){"use strict";return getAPI(this.api+"sketch/?id="+t,e),this},D3D.Box.prototype.setSketch=function(t,e){"use strict";return sendAPI(this.api+"sketch",{data:t},e),this},D3D.Box.prototype.getSketchStatus=function(t){"use strict";return getAPI(this.api+"sketch/status",t),this},D3D.Box.prototype.setSketchClear=function(t){"use strict";return sendAPI(this.api+"sketch/clear",t),this},D3D.Box.prototype.getSystemVersions=function(t){"use strict";return getAPI(this.api+"system/fwversions",t),this},D3D.Box.prototype.getUpdateStatus=function(t){"use strict";return getAPI(this.api+"update/status",t),this},D3D.Box.prototype.setUpdateDownload=function(t){"use strict";return sendAPI(this.api+"update/download",{},t),this},D3D.Box.prototype.setUpdateInstall=function(t){"use strict";return sendAPI(this.api+"update/install",{},t),this},D3D.Box.prototype.setUpdateClear=function(t){"use strict";return sendAPI(this.api+"update/clear",{},t),this},D3D.Printer=function(t){"use strict";this.status={},this.config={},this.updateConfig(t)},D3D.Printer.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("printer")&&(this.config[e]=t[e]);return this},D3D.Printer.prototype.getStartCode=function(){"use strict";var t=this.config["printer.startcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.getEndCode=function(){"use strict";var t=this.config["printer.endcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.subsituteVariables=function(t){"use strict";var e=this.config["printer.temperature"],i=this.config["printer.bed.temperature"],r=this.config["printer.heatup.temperature"],n=this.config["printer.heatup.bed.temperature"],s=this.config["printer.type"],o=this.config["printer.heatedbed"];switch(s){case"makerbot_replicator2":s="r2";break;case"makerbot_replicator2x":s="r2x";break;case"makerbot_thingomatic":s="t6";break;case"makerbot_generic":s="r2";break;case"_3Dison_plus":s="r2"}var a=o?"":";";return t=t.replace(/{printingTemp}/gi,e),t=t.replace(/{printingBedTemp}/gi,i),t=t.replace(/{preheatTemp}/gi,r),t=t.replace(/{preheatBedTemp}/gi,n),t=t.replace(/{printerType}/gi,s),t=t.replace(/{if heatedBed}/gi,a)},D3D.Paths=function(t,e){"use strict";Array.call(this),this.setPaths(t||[]),this.closed=void 0!==e?e:!0},D3D.Paths.prototype=Object.create(Array.prototype),D3D.Paths.prototype.setPaths=function(t){"use strict";for(var e=0;e<t.length;e++){var i=t[e];this.push(i)}return this},D3D.Paths.prototype.clip=function(t,e){"use strict";var i=new ClipperLib.Paths,r=new ClipperLib.Clipper;return r.AddPaths(this,ClipperLib.PolyType.ptSubject,this.closed),r.AddPaths(t,ClipperLib.PolyType.ptClip,t.closed),r.Execute(e,i),new D3D.Paths(i)},D3D.Paths.prototype.union=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctUnion)},D3D.Paths.prototype.difference=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctDifference)},D3D.Paths.prototype.intersect=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctIntersection)},D3D.Paths.prototype.xor=function(){"use strict";return this.clip(path,ClipperLib.ClipType.ctXor)},D3D.Paths.prototype.offset=function(t){"use strict";var e=new ClipperLib.Paths,i=new ClipperLib.ClipperOffset(1,1);return i.AddPaths(this,ClipperLib.JoinType.jtRound,ClipperLib.EndType.etClosedPolygon),i.Execute(e,t),new D3D.Paths(e)},D3D.Paths.prototype.scaleUp=function(t){"use strict";ClipperLib.JS.ScaleUpPaths(this,t);return this},D3D.Paths.prototype.scaleDown=function(t){"use strict";ClipperLib.JS.ScaleDownPaths(this,t);return this},D3D.Paths.prototype.tresholdArea=function(t){"use strict";for(var e=0;e<this.length;e++){var i=this[e],r=ClipperLib.Clipper.Area(i);t>r&&(this.splice(e,1),e--)}return areas},D3D.Paths.prototype.area=function(){"use strict";return ClipperLib.Clipper.Area(this)},D3D.Paths.prototype.join=function(t){"use strict";for(var e=0;e<t.length;e++)this.push(t[e]);return this},D3D.Paths.prototype.clone=function(){"use strict";return new D3D.Paths(ClipperLib.JS.Clone(this),this.closed)},D3D.Paths.prototype.bounds=function(){"use strict";return ClipperLib.Clipper.GetBounds(this)},D3D.Paths.prototype.reverse=function(){"use strict";return ClipperLib.Clipper.ReversePaths(this),this},D3D.Paths.prototype.draw=function(t,e){"use strict";t.strokeStyle=e;for(var i=0;i<this.length;i++){var r=this[i];t.beginPath();for(var n=this.closed?r.length+1:r.length,s=0;n>s;s++){var o=r[s%r.length];t.lineTo(2*o.X,2*o.Y)}t.stroke()}},D3D.Slicer=function(){"use strict";this.lines=[]},D3D.Slicer.prototype.setMesh=function(t){"use strict";t.updateMatrix();var e=t.geometry.clone();return e instanceof THREE.BufferGeometry&&(e=(new THREE.Geometry).fromBufferGeometry(e)),e.mergeVertices(),e.applyMatrix(t.matrix),this.geometry=e,this.createLines(),this},D3D.Slicer.prototype.createLines=function(){"use strict";function t(t,r){var n=e[t+"_"+r]||e[r+"_"+t];return void 0===n&&(n=i.lines.length,e[t+"_"+r]=n,i.lines.push({line:new THREE.Line3(i.geometry.vertices[t],i.geometry.vertices[r]),connects:[],normals:[],ignore:0})),n}this.lines=[];for(var e={},i=this,r=0;r<this.geometry.faces.length;r++){var n=this.geometry.faces[r],s=(new THREE.Vector2).set(n.normal.x,n.normal.z).normalize(),o=t(n.a,n.b),a=t(n.b,n.c),p=t(n.c,n.a);this.lines[o].connects.push(a,p),this.lines[a].connects.push(p,o),this.lines[p].connects.push(o,a),this.lines[o].normals.push(s),this.lines[a].normals.push(s),this.lines[p].normals.push(s)}},D3D.Slicer.prototype.slice=function(t,e){"use strict";for(var i=[],r=0;r<this.lines.length;r++)for(var n=this.lines[r],s=Math.ceil(Math.min(n.line.start.y,n.line.end.y)/e),o=Math.floor(Math.max(n.line.start.y,n.line.end.y)/e),a=s;o>=a;a++)a>=0&&(void 0===i[a]&&(i[a]=[]),i[a].push(r));for(var p=[],c=1;c<i.length-1;c++){for(var h=i[c],u=c*e,l=[],r=0;r<h.length;r++){var f=h[r],n=this.lines[f].line,g=(u-n.start.y)/(n.end.y-n.start.y),D=n.end.x*g+n.start.x*(1-g),d=n.end.z*g+n.start.z*(1-g);l[f]=new THREE.Vector2(D,d)}for(var y=[],v=new D3D.Paths([],!0),r=0;r<h.length;r++){var f=h[r];if(-1===y.indexOf(f)){for(var P=[];-1!==f;){var m=l[f];P.push({X:m.x,Y:m.y}),y.push(f);for(var w=this.lines[f].connects,x=this.lines[f].normals,b=0;b<w.length;b++)if(f=w[b],l[f]&&-1===y.indexOf(f)){var B=(new THREE.Vector2).set(m.x,m.y),A=l[f],C=B.sub(A).normal().normalize(),S=x[Math.floor(b/2)];if(C.dot(S)>0)break;f=-1}else f=-1}P.length>0&&v.push(new D3D.Paths([P]))}}for(var T=[],r=0;r<v.length;r++){for(var k=v[r],I=!1,b=0;b<T.length;b++){var L=T[b];if(L.intersect(k).length>0){L.join(k),I=!0;break}}I||T.push(k)}if(!(T.length>0))break;p.push(T)}return p},D3D.Slicer.prototype.slicesToData=function(t,e){"use strict";for(var i=100,r=e.config["printer.layerHeight"]*i,n=e.config["printer.dimensions.z"]*i,s=e.config["printer.wallThickness"]*i,o=e.config["printer.shellThickness"]*i,a=e.config["printer.fillSize"]*i,p=(e.config["printer.brimOffset"]*i,Math.ceil(o/r)),c=[],h=this.getFillTemplate(n,a,!0,!0),u=0;u<t.length;u++){var l=t[u],f=[];c.push(f);var g=new D3D.Paths;if(u-p>=0)for(var D=t[u-p],d=0;d<D.length;d++)g.join(D[d]);var y=new D3D.Paths;if(u+p<t.length)for(var D=t[u+p],d=0;d<D.length;d++)y.join(D[d]);for(var v=y.intersect(g).clone().scaleUp(i),d=0;d<l.length;d++){var P=l[d],m=P.clone();m.scaleUp(i);for(var w=new D3D.Paths,x=s;o>=x;x+=s){var b=m.offset(-x);w.join(b)}var B=(b||m).offset(-s/2),A=B.difference(v),C=B.difference(A),S=new D3D.Paths([]);S.join(h.intersect(C));var T=this.getFillTemplate(n,s,u%2===0,u%2===1);S.join(T.intersect(A)),f.push({outerLayer:m.scaleDown(i),fill:S.scaleDown(i),insets:w.scaleDown(i)})}}return c},D3D.Slicer.prototype.getFillTemplate=function(t,e,i,r){"use strict";var n=new D3D.Paths([],!1);if(i)for(var s=0;t>=s;s+=e)n.push([{X:s,Y:0},{X:s,Y:t}]);if(r)for(var s=0;t>=s;s+=e)n.push([{X:0,Y:s},{X:t,Y:s}]);return n},D3D.Slicer.prototype.dataToGcode=function(t,e){"use strict";function i(t){for(var e=[],i=0;i<t.length;i++)for(var n,s=t[i],o=t.closed?s.length+1:s.length,a=0;o>a;a++){var c=s[a%s.length];if(0===a)d>f&&u&&e.push(["G0","E"+(d-g).toFixed(3),"F"+(60*l).toFixed(3)].join(" ")),e.push(["G0","X"+c.X.toFixed(3)+" Y"+c.Y.toFixed(3)+" Z"+x,"F"+60*p].join(" ")),d>f&&u&&e.push(["G0","E"+d.toFixed(3),"F"+(60*l).toFixed(3)].join(" "));else{var D=(new THREE.Vector2).set(c.X,c.Y),m=(new THREE.Vector2).set(n.X,n.Y),w=D.distanceTo(m);d+=w*h*r/v*P,e.push(["G1","X"+c.X.toFixed(3)+" Y"+c.Y.toFixed(3)+" Z"+x,"F"+y,"E"+d.toFixed(3)].join(" "))}n=c}return e}for(var r=e.config["printer.layerHeight"],n=e.config["printer.speed"],s=e.config["printer.bottomLayerSpeed"],o=e.config["printer.firstLayerSlow"],a=e.config["printer.bottomFlowRate"],p=e.config["printer.travelSpeed"],c=e.config["printer.filamentThickness"],h=e.config["printer.wallThickness"],u=(e.config["printer.enableTraveling"],e.config["printer.retraction.enabled"]),l=e.config["printer.retraction.speed"],f=e.config["printer.retraction.minDistance"],g=e.config["printer.retraction.amount"],D=e.getStartCode(),d=0,y=o?(60*s).toFixed(3):(60*n).toFixed(3),v=Math.pow(c/2,2)*Math.PI,P=a,m=0;m<t.length;m++){var w=t[m];2===m&&(D.push("M106"),y=(60*n).toFixed(3),P=1);for(var x=((m+1)*r).toFixed(3),b=0;b<w.length;b++){var B=w[b];D=D.concat(i(B.outerLayer)),D=D.concat(i(B.insets)),D=D.concat(i(B.fill))}}return D=D.concat(e.getEndCode())},D3D.Slicer.prototype.drawPaths=function(t,e,i){"use strict";var r=t.config["printer.layerHeight"],n=t.config["printer.dimensions.z"],s=this.slice(n,r),o=this.slicesToData(s,t),a=document.createElement("canvas");a.width=400,a.height=400;for(var p=a.getContext("2d"),c=e;i>c;c++)for(var h=o[c%o.length],u=0;u<h.length;u++){var l=h[u];l.insets.draw(p,"blue"),l.outerLayer.draw(p,"green"),l.fill.draw(p,"red")}return a},D3D.Slicer.prototype.getGcode=function(t){"use strict";var e=t.config["printer.layerHeight"],i=t.config["printer.dimensions.z"],r=(new Date).getTime(),n=this.slice(i,e),s=(new Date).getTime();console.log("Slicing: "+(s-r)+"ms");var r=(new Date).getTime(),o=this.slicesToData(n,t),s=(new Date).getTime();console.log("Data: "+(s-r)+"ms");var r=(new Date).getTime(),a=this.dataToGcode(o,t),s=(new Date).getTime();return console.log("Gcode: "+(s-r)+"ms"),a};
\ No newline at end of file
+function sendAPI(t,e,i){"use strict";$.ajax({url:t,type:"POST",data:e,dataType:"json",timeout:1e4,success:function(t){"success"===t.status?void 0!==i&&i(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),sendAPI(t,e,i)})}function getAPI(t,e){"use strict";$.ajax({url:t,dataType:"json",timeout:5e3,success:function(t){"success"===t.status?void 0!==e&&e(t.data):console.warn(t.msg)}}).fail(function(){console.warn("Failed connecting to "+t),getAPI(t,e)})}function downloadFile(t,e){"use strict";$(document.createElement("a")).attr({download:t,href:"data:text/plain,"+e})[0].click()}var D3D={version:"0.1",website:"http://www.doodle3d.com/",contact:"develop@doodle3d.com"};THREE.Vector2.prototype.normal=function(){"use strict";var t=this.y,e=-this.x;return this.set(t,e)},Array.prototype.clone=function(){"use strict";for(var t=[],e=0;e<this.length;e++)t[e]=this[e];return t},D3D.Box=function(t){"use strict";var e=this;this.batchSize=512,this.maxBufferedLines=4096,this.localIp=t,this.api="http://"+t+"/d3dapi/",this.config={},this.printBatches=[],this.currentBatch=0,this.loaded=!1,this.getConfigAll(function(t){e.updateConfig(t),e.printer=new D3D.Printer(t),e.update(),e.loaded=!0,void 0!==e.onload&&e.onload()})},D3D.Box.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("doodle3d")&&(this.config[e]=t[e]);return this},D3D.Box.prototype.update=function(){"use strict";this.printBatches.length>0&&this.printer.status.buffered_lines+this.batchSize<=this.maxBufferedLines?this.printBatch():this.updateState()},D3D.Box.prototype.updateState=function(){"use strict";var t=this;this.getInfoStatus(function(e){t.printer.status=e,void 0!==t.onupdate&&t.onupdate(e),t.update()})},D3D.Box.prototype.print=function(t){"use strict";for(this.currentBatch=0,t=t.clone();t.length>0;){var e=t.splice(0,Math.min(this.batchSize,t.length));this.printBatches.push(e)}return this},D3D.Box.prototype.printBatch=function(){"use strict";var t=this,e=this.printBatches.shift();this.setPrinterPrint({start:0===this.currentBatch?!0:!1,first:0===this.currentBatch?!0:!1,gcode:e.join("\n")},function(e){console.log("batch sent: "+t.currentBatch,e),t.printBatches.length>0&&t.currentBatch++,t.updateState()})},D3D.Box.prototype.stopPrint=function(){"use strict";this.printBatches=[],this.currentBatch=0;var t=["M107 ;fan off","G91 ;relative positioning","G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure","G1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more","G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way","M84 ;disable axes / steppers","G90 ;absolute positioning","M104 S180",";M140 S70","M117 Done                 ;display message (20 characters to clear whole screen)"];return this.setPrinterStop({gcode:t.join("\n")},function(t){console.log("Printer stop command sent")}),this},D3D.Box.prototype.getConfig=function(t,e){"use strict";return getAPI(this.api+"config/?"+t.join("=&")+"=",e),this},D3D.Box.prototype.getConfigAll=function(t){"use strict";return getAPI(this.api+"config/all",t),this},D3D.Box.prototype.setConfig=function(t,e){"use strict";var i=this;return sendAPI(this.api+"config",t,function(r){for(var n in r.validation)"ok"!==r.validation[n]&&delete t[n];i.updateConfig(t),i.printer.updateConfig(t),void 0!==e&&e(r)}),this},D3D.Box.prototype.getInfo=function(t){"use strict";return getAPI(this.api+"info",t),this},D3D.Box.prototype.getInfoStatus=function(t){"use strict";return getAPI(this.api+"info/status",t),this},D3D.Box.prototype.downloadInfoLogFiles=function(){"use strict";window.location=this.api+"info/logfiles"},D3D.Box.prototype.getInfoAcces=function(t){"use strict";return getAPI(this.api+"info/access",t),this},D3D.Box.prototype.getNetworkScan=function(t){"use strict";return getAPI(this.api+"network/scan",t),this},D3D.Box.prototype.getNetworkKnown=function(t){"use strict";return getAPI(this.api+"network/known",t),this},D3D.Box.prototype.getNetworkStatus=function(t){"use strict";return getAPI(this.api+"network/status",t),this},D3D.Box.prototype.setNetworkAssosiate=function(t,e){"use strict";return sendAPI(this.api+"network/associate",t,e),this},D3D.Box.prototype.setNetworkDisassosiate=function(t){"use strict";return sendAPI(this.api+"network/disassociate",{},t),this},D3D.Box.prototype.setNetworkOpenAP=function(t){"use strict";return sendAPI(this.api+"network/openap",{},t),this},D3D.Box.prototype.setNetworkRemove=function(t,e){"use strict";return sendAPI(this.api+"network/remove",{ssid:t},e),this},D3D.Box.prototype.getNetworkSignin=function(t){"use strict";return getAPI(this.api+"network/signin",t),this},D3D.Box.prototype.getNetworkAlive=function(t){"use strict";return getAPI(this.api+"network/alive",t),this},D3D.Box.prototype.getPrinterTemperature=function(t){"use strict";return getAPI(this.api+"printer/temperature",t),this},D3D.Box.prototype.getPrinterProgress=function(t){"use strict";return getAPI(this.api+"printer/progress",t),this},D3D.Box.prototype.getPrinterState=function(t){"use strict";return getAPI(this.api+"printer/state",t),this},D3D.Box.prototype.getPrinterListAll=function(t){"use strict";return getAPI(this.api+"printer/listall",t),this},D3D.Box.prototype.setPrinterHeatup=function(t){"use strict";return sendAPI(this.api+"printer/heatup",{},t),this},D3D.Box.prototype.setPrinterPrint=function(t,e){"use strict";return sendAPI(this.api+"printer/print",t,e),this},D3D.Box.prototype.setPrinterStop=function(t,e){"use strict";return sendAPI(this.api+"printer/stop",t,e),this},D3D.Box.prototype.getSketch=function(t,e){"use strict";return getAPI(this.api+"sketch/?id="+t,e),this},D3D.Box.prototype.setSketch=function(t,e){"use strict";return sendAPI(this.api+"sketch",{data:t},e),this},D3D.Box.prototype.getSketchStatus=function(t){"use strict";return getAPI(this.api+"sketch/status",t),this},D3D.Box.prototype.setSketchClear=function(t){"use strict";return sendAPI(this.api+"sketch/clear",t),this},D3D.Box.prototype.getSystemVersions=function(t){"use strict";return getAPI(this.api+"system/fwversions",t),this},D3D.Box.prototype.getUpdateStatus=function(t){"use strict";return getAPI(this.api+"update/status",t),this},D3D.Box.prototype.setUpdateDownload=function(t){"use strict";return sendAPI(this.api+"update/download",{},t),this},D3D.Box.prototype.setUpdateInstall=function(t){"use strict";return sendAPI(this.api+"update/install",{},t),this},D3D.Box.prototype.setUpdateClear=function(t){"use strict";return sendAPI(this.api+"update/clear",{},t),this},D3D.Printer=function(t){"use strict";this.status={},this.config={},this.updateConfig(t)},D3D.Printer.prototype.updateConfig=function(t){"use strict";for(var e in t)0===e.indexOf("printer")&&(this.config[e]=t[e]);return this},D3D.Printer.prototype.getStartCode=function(){"use strict";var t=this.config["printer.startcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.getEndCode=function(){"use strict";var t=this.config["printer.endcode"];return t=this.subsituteVariables(t),t.split("\n")},D3D.Printer.prototype.subsituteVariables=function(t){"use strict";var e=this.config["printer.temperature"],i=this.config["printer.bed.temperature"],r=this.config["printer.heatup.temperature"],n=this.config["printer.heatup.bed.temperature"],s=this.config["printer.type"],o=this.config["printer.heatedbed"];switch(s){case"makerbot_replicator2":s="r2";break;case"makerbot_replicator2x":s="r2x";break;case"makerbot_thingomatic":s="t6";break;case"makerbot_generic":s="r2";break;case"_3Dison_plus":s="r2"}var a=o?"":";";return t=t.replace(/{printingTemp}/gi,e),t=t.replace(/{printingBedTemp}/gi,i),t=t.replace(/{preheatTemp}/gi,r),t=t.replace(/{preheatBedTemp}/gi,n),t=t.replace(/{printerType}/gi,s),t=t.replace(/{if heatedBed}/gi,a)},D3D.Paths=function(t,e){"use strict";Array.call(this),this.setPaths(t||[]),this.closed=void 0!==e?e:!0},D3D.Paths.prototype=Object.create(Array.prototype),D3D.Paths.prototype.setPaths=function(t){"use strict";for(var e=0;e<t.length;e++){var i=t[e];this.push(i)}return this},D3D.Paths.prototype.clip=function(t,e){"use strict";var i=new ClipperLib.Paths,r=new ClipperLib.Clipper;return r.AddPaths(this,ClipperLib.PolyType.ptSubject,this.closed),r.AddPaths(t,ClipperLib.PolyType.ptClip,t.closed),r.Execute(e,i),new D3D.Paths(i)},D3D.Paths.prototype.union=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctUnion)},D3D.Paths.prototype.difference=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctDifference)},D3D.Paths.prototype.intersect=function(t){"use strict";return this.clip(t,ClipperLib.ClipType.ctIntersection)},D3D.Paths.prototype.xor=function(){"use strict";return this.clip(path,ClipperLib.ClipType.ctXor)},D3D.Paths.prototype.offset=function(t){"use strict";var e=new ClipperLib.Paths,i=new ClipperLib.ClipperOffset(1,1);return i.AddPaths(this,ClipperLib.JoinType.jtRound,ClipperLib.EndType.etClosedPolygon),i.Execute(e,t),new D3D.Paths(e)},D3D.Paths.prototype.scaleUp=function(t){"use strict";ClipperLib.JS.ScaleUpPaths(this,t);return this},D3D.Paths.prototype.scaleDown=function(t){"use strict";ClipperLib.JS.ScaleDownPaths(this,t);return this},D3D.Paths.prototype.optimizePath=function(t){"use strict";for(var e=new D3D.Paths;e.length!==this.length;){for(var i,r,n=void 0,s=0;s<this.length;s++){var o=this[s];if(-1===e.indexOf(o)){var a=new THREE.Vector2(o[0].X,o[0].Y),c=new THREE.Vector2(o[o.length-1].X,o[o.length-1].Y),p=a.sub(t).length();(void 0===n||n>p)&&(r=o,n=p,i=!1);var p=c.sub(t).length();n>p&&(r=o,n=p,i=!0)}}i&&r.reverse();var h=r[r.length-1];t=new THREE.Vector2(h.X,h.Y),e.push(r)}return e},D3D.Paths.prototype.tresholdArea=function(t){"use strict";for(var e=0;e<this.length;e++){var i=this[e],r=ClipperLib.Clipper.Area(i);t>r&&(this.splice(e,1),e--)}return areas},D3D.Paths.prototype.join=function(t){"use strict";for(var e=0;e<t.length;e++)this.push(t[e]);return this},D3D.Paths.prototype.clone=function(){"use strict";return new D3D.Paths(ClipperLib.JS.Clone(this),this.closed)},D3D.Paths.prototype.bounds=function(){"use strict";return ClipperLib.Clipper.GetBounds(this)},D3D.Paths.prototype.draw=function(t,e){"use strict";t.strokeStyle=e;for(var i=0;i<this.length;i++){var r=this[i];t.beginPath();for(var n=this.closed?r.length+1:r.length,s=0;n>s;s++){var o=r[s%r.length];t.lineTo(2*o.X,2*o.Y)}t.stroke()}},D3D.Slicer=function(){"use strict";this.lines=[]},D3D.Slicer.prototype.setMesh=function(t){"use strict";t.updateMatrix();var e=t.geometry.clone();return e instanceof THREE.BufferGeometry&&(e=(new THREE.Geometry).fromBufferGeometry(e)),e.mergeVertices(),e.applyMatrix(t.matrix),this.geometry=e,this.createLines(),this},D3D.Slicer.prototype.createLines=function(){"use strict";function t(t,r){var n=e[t+"_"+r]||e[r+"_"+t];return void 0===n&&(n=i.lines.length,e[t+"_"+r]=n,i.lines.push({line:new THREE.Line3(i.geometry.vertices[t],i.geometry.vertices[r]),connects:[],normals:[],ignore:0})),n}this.lines=[];for(var e={},i=this,r=0;r<this.geometry.faces.length;r++){var n=this.geometry.faces[r],s=(new THREE.Vector2).set(n.normal.x,n.normal.z).normalize(),o=t(n.a,n.b),a=t(n.b,n.c),c=t(n.c,n.a);this.lines[o].connects.push(a,c),this.lines[a].connects.push(c,o),this.lines[c].connects.push(o,a),this.lines[o].normals.push(s),this.lines[a].normals.push(s),this.lines[c].normals.push(s)}},D3D.Slicer.prototype.slice=function(t,e){"use strict";for(var i=[],r=0;r<this.lines.length;r++)for(var n=this.lines[r],s=Math.ceil(Math.min(n.line.start.y,n.line.end.y)/e),o=Math.floor(Math.max(n.line.start.y,n.line.end.y)/e),a=s;o>=a;a++)a>=0&&(void 0===i[a]&&(i[a]=[]),i[a].push(r));for(var c=[],p=1;p<i.length-1;p++){for(var h=i[p],u=p*e,l=[],r=0;r<h.length;r++){var f=h[r],n=this.lines[f].line,g=(u-n.start.y)/(n.end.y-n.start.y),d=n.end.x*g+n.start.x*(1-g),D=n.end.z*g+n.start.z*(1-g);l[f]=new THREE.Vector2(d,D)}for(var y=[],v=new D3D.Paths([],!0),r=0;r<h.length;r++){var f=h[r];if(-1===y.indexOf(f)){for(var P=[];-1!==f;){var m=l[f];P.push({X:m.x,Y:m.y}),y.push(f);for(var w=this.lines[f].connects,x=this.lines[f].normals,b=0;b<w.length;b++)if(f=w[b],l[f]&&-1===y.indexOf(f)){var B=(new THREE.Vector2).set(m.x,m.y),T=l[f],A=B.sub(T).normal().normalize(),S=x[Math.floor(b/2)];if(A.dot(S)>0)break;f=-1}else f=-1}P.length>0&&v.push(new D3D.Paths([P]))}}for(var k=[],r=0;r<v.length;r++){for(var C=v[r],I=!1,b=0;b<k.length;b++){var E=k[b];if(E.intersect(C).length>0){E.join(C),I=!0;break}}I||k.push(C)}if(!(k.length>0))break;c.push(k)}return c},D3D.Slicer.prototype.slicesToData=function(t,e){"use strict";for(var i=100,r=e.config["printer.layerHeight"]*i,n=e.config["printer.dimensions.z"]*i,s=e.config["printer.wallThickness"]*i,o=e.config["printer.shellThickness"]*i,a=e.config["printer.fillSize"]*i,c=(e.config["printer.brimOffset"]*i,Math.ceil(o/r)),p=[],h=this.getFillTemplate({left:0,top:0,right:n,bottom:n},a,!0,!0),u=0;u<t.length;u++){var l=t[u],f=[];p.push(f);var g=new D3D.Paths([],!0);if(u-c>=0)for(var d=t[u-c],D=0;D<d.length;D++)g.join(d[D]);var y=new D3D.Paths([],!0);if(u+c<t.length)for(var d=t[u+c],D=0;D<d.length;D++)y.join(d[D]);for(var v=y.intersect(g).clone().scaleUp(i),D=0;D<l.length;D++){var P=l[D],m=P.clone();m.scaleUp(i);for(var w=new D3D.Paths([],!0),x=s;o>=x;x+=s){var b=m.offset(-x);w.join(b)}var B=(b||m).offset(-s/2),T=B.difference(v),A=B.difference(T),S=new D3D.Paths([],!1);if(S.join(h.intersect(A)),T.length>0){var k=this.getFillTemplate(T.bounds(),s,u%2===0,u%2===1);S.join(k.intersect(T))}var C=w[w.length-1],I=C[C.length-1],E=new THREE.Vector2(I.X,I.Y);S=S.optimizePath(E),f.push({outerLayer:m.scaleDown(i),fill:S.scaleDown(i),insets:w.scaleDown(i)})}}return p},D3D.Slicer.prototype.getFillTemplate=function(t,e,i,r){"use strict";var n=new D3D.Paths([],!1);if(i)for(var s=Math.floor(t.left);s<=Math.ceil(t.right);s+=e)n.push([{X:s,Y:t.top},{X:s,Y:t.bottom}]);if(r)for(var s=Math.floor(t.top);s<=Math.floor(t.bottom);s+=e)n.push([{X:t.left,Y:s},{X:t.right,Y:s}]);return n},D3D.Slicer.prototype.dataToGcode=function(t,e){"use strict";function i(t){for(var e=[],i=0;i<t.length;i++)for(var n,s=t[i],o=t.closed?s.length+1:s.length,a=0;o>a;a++){var p=s[a%s.length];if(0===a)D>f&&u&&e.push(["G0","E"+(D-g).toFixed(3),"F"+(60*l).toFixed(3)].join(" ")),e.push(["G0","X"+p.X.toFixed(3)+" Y"+p.Y.toFixed(3)+" Z"+x,"F"+60*c].join(" ")),D>f&&u&&e.push(["G0","E"+D.toFixed(3),"F"+(60*l).toFixed(3)].join(" "));else{var d=(new THREE.Vector2).set(p.X,p.Y),m=(new THREE.Vector2).set(n.X,n.Y),w=d.distanceTo(m);D+=w*h*r/v*P,e.push(["G1","X"+p.X.toFixed(3)+" Y"+p.Y.toFixed(3)+" Z"+x,"F"+y,"E"+D.toFixed(3)].join(" "))}n=p}return e}for(var r=e.config["printer.layerHeight"],n=e.config["printer.speed"],s=e.config["printer.bottomLayerSpeed"],o=e.config["printer.firstLayerSlow"],a=e.config["printer.bottomFlowRate"],c=e.config["printer.travelSpeed"],p=e.config["printer.filamentThickness"],h=e.config["printer.wallThickness"],u=(e.config["printer.enableTraveling"],e.config["printer.retraction.enabled"]),l=e.config["printer.retraction.speed"],f=e.config["printer.retraction.minDistance"],g=e.config["printer.retraction.amount"],d=e.getStartCode(),D=0,y=o?(60*s).toFixed(3):(60*n).toFixed(3),v=Math.pow(p/2,2)*Math.PI,P=a,m=0;m<t.length;m++){var w=t[m];2===m&&(d.push("M106"),y=(60*n).toFixed(3),P=1);for(var x=((m+1)*r).toFixed(3),b=0;b<w.length;b++){var B=w[b];d=d.concat(i(B.outerLayer)),d=d.concat(i(B.insets)),d=d.concat(i(B.fill))}}return d=d.concat(e.getEndCode())},D3D.Slicer.prototype.drawPaths=function(t,e,i){"use strict";var r=t.config["printer.layerHeight"],n=t.config["printer.dimensions.z"],s=this.slice(n,r),o=this.slicesToData(s,t),a=document.createElement("canvas");a.width=400,a.height=400;for(var c=a.getContext("2d"),p=e;i>p;p++)for(var h=o[p%o.length],u=0;u<h.length;u++){var l=h[u];l.insets.draw(c,"blue"),l.outerLayer.draw(c,"green"),l.fill.draw(c,"red")}return a},D3D.Slicer.prototype.getGcode=function(t){"use strict";var e=t.config["printer.layerHeight"],i=t.config["printer.dimensions.z"],r=(new Date).getTime(),n=this.slice(i,e),s=(new Date).getTime();console.log("Slicing: "+(s-r)+"ms");var r=(new Date).getTime(),o=this.slicesToData(n,t),s=(new Date).getTime();console.log("Data: "+(s-r)+"ms");var r=(new Date).getTime(),a=this.dataToGcode(o,t),s=(new Date).getTime();return console.log("Gcode: "+(s-r)+"ms"),a};
\ No newline at end of file
diff --git a/slice_test.html b/slice_test.html
index d7572b0..49b0bd0 100644
--- a/slice_test.html
+++ b/slice_test.html
@@ -106,7 +106,7 @@ var geometry = (function () {
 })();
 
 var material = new THREE.MeshBasicMaterial({color: 0x000000, wireframe: true});
-//var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
+var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
 var geometry = new THREE.BoxGeometry(10, 10, 10, 1, 1, 1);
 //var geometry = new THREE.SphereGeometry(10, 10, 10);
 var mesh = new THREE.Mesh(geometry, material);
@@ -117,8 +117,10 @@ mesh.position.z = 100;
 var loader = new THREE.STLLoader();
 loader.load("models/diamond.stl", function (geometry) {
 	var geometry = new THREE.BoxGeometry(10, 10, 10, 1, 1, 1);
+	//var geometry = new THREE.SphereGeometry(10, 10, 10);
 	//var geometry = new THREE.TorusGeometry(20, 10, 30, 30);
 
+	
 	var geometry = (function () {
 		"use strict";
 
@@ -142,6 +144,7 @@ loader.load("models/diamond.stl", function (geometry) {
 
 		return geometry;
 	})();
+	
 
 	var mesh = new THREE.Mesh(geometry, material);
 	
diff --git a/src/paths.js b/src/paths.js
index ba7ac12..4af0d8a 100644
--- a/src/paths.js
+++ b/src/paths.js
@@ -82,7 +82,83 @@ D3D.Paths.prototype.scaleDown = function (factor) {
 
 	return this;
 };
+D3D.Paths.prototype.lastPoint = function () {
+	"use strict";
+
+	var lastPath = this[this.length - 1];
+	var lastPoint = this.closed ? lastPath[0] : lastPath[lastPath.length - 1];
+	return new THREE.Vector2(lastPoint.X, lastPoint.Y);
+};
+D3D.Paths.prototype.optimizePath = function (start) {
+	"use strict";
+
+	var optimizedPaths = new D3D.Paths([], this.closed);
+	var donePaths = [];
+
+	while (optimizedPaths.length !== this.length) {
+		var minLength = false;
+		var reverse;
+		var minPath;
+		var offset;
+		var pathIndex;
+
+		for (var i = 0; i < this.length; i ++) {
+			var path = this[i];
+
+			if (donePaths.indexOf(i) === -1) {
+
+				if (this.closed) {
+					for (var j = 0; j < path.length; j ++) {
+						var point = new THREE.Vector2(path[j].X, path[j].Y);
+						var length = point.sub(start).length();
+						if (minLength === false || length < minLength) {
+							minPath = path;
+							minLength = length;
+							offset = j;
+							pathIndex = i;
+						}
+					}
+				}
+				else {
+					var startPoint = new THREE.Vector2(path[0].X, path[0].Y);
+					var length = startPoint.sub(start).length();
+					if (minLength === false || length < minLength) {
+						minPath = path;
+						minLength = length;
+						reverse = false;
+						pathIndex = i;
+					}
+					var endPoint = new THREE.Vector2(path[path.length - 1].X, path[path.length - 1].Y);
+					var length = endPoint.sub(start).length();
+					if (length < minLength) {
+						minPath = path;
+						minLength = length;
+						reverse = true;
+						pathIndex = i;
+					}
+				}
+			}
+		}
+
+		if (this.closed) {
+			minPath = minPath.concat(minPath.splice(0, offset));
+			var point = minPath[0];
+		}
+		else {
+			if (reverse) {
+				minPath.reverse();	
+			}
+			var point = minPath[minPath.length - 1];
+		}
+		donePaths.push(pathIndex);
+		start = new THREE.Vector2(point.X, point.Y);
+		optimizedPaths.push(minPath);
+	}
+
+	return optimizedPaths;
+};
 D3D.Paths.prototype.tresholdArea = function (minArea) {
+	//code not tested yet
 	"use strict";
 
 	for (var i = 0; i < this.length; i ++) {
@@ -98,11 +174,6 @@ D3D.Paths.prototype.tresholdArea = function (minArea) {
 	
 	return areas;
 };
-D3D.Paths.prototype.area = function () {
-	"use strict";
-
-	return ClipperLib.Clipper.Area(this);
-};
 D3D.Paths.prototype.join = function (path) {
 	"use strict";
 
@@ -122,13 +193,6 @@ D3D.Paths.prototype.bounds = function () {
 
 	return ClipperLib.Clipper.GetBounds(this);
 };
-D3D.Paths.prototype.reverse = function () {
-	"use strict";
-
-	ClipperLib.Clipper.ReversePaths(this);
-
-	return this;
-};
 D3D.Paths.prototype.draw = function (context, color) {
 	"use strict";
 
@@ -136,6 +200,9 @@ D3D.Paths.prototype.draw = function (context, color) {
 	for (var i = 0; i < this.length; i ++) {
 		var shape = this[i];
 
+		var point = shape[0];
+		context.fillText(i, point.X*2, point.Y*2);
+
 		context.beginPath();
 		var length = this.closed ? (shape.length + 1) : shape.length;
 		for (var j = 0; j < length; j ++) {
diff --git a/src/slicer.js b/src/slicer.js
index b3ce248..ca38398 100644
--- a/src/slicer.js
+++ b/src/slicer.js
@@ -235,9 +235,16 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 	var brimOffset = printer.config["printer.brimOffset"] * scale;
 	var skinCount = Math.ceil(shellThickness/layerHeight);
 
+	var start = new THREE.Vector2(0, 0);
+
 	var data = [];
 
-	var lowFillTemplate = this.getFillTemplate(dimensionsZ, fillSize, true, true);
+	var lowFillTemplate = this.getFillTemplate({
+		left: 0, 
+		top: 0, 
+		right: dimensionsZ, 
+		bottom: dimensionsZ
+	}, fillSize, true, true);
 
 	for (var layer = 0; layer < slices.length; layer ++) {
 		var slice = slices[layer];
@@ -245,14 +252,14 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 		var layerData = [];
 		data.push(layerData);
 		
-		var downSkin = new D3D.Paths();
+		var downSkin = new D3D.Paths([], true);
 		if (layer - skinCount >= 0) {
 			var downLayer = slices[layer - skinCount];
 			for (var i = 0; i < downLayer.length; i ++) {
 				downSkin.join(downLayer[i]);
 			}
 		}
-		var upSkin = new D3D.Paths();
+		var upSkin = new D3D.Paths([], true);
 		if (layer + skinCount < slices.length) {
 			var downLayer = slices[layer + skinCount];
 			for (var i = 0; i < downLayer.length; i ++) {
@@ -268,7 +275,7 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 			var outerLayer = part.clone();
 			outerLayer.scaleUp(scale);
 
-			var insets = new D3D.Paths();
+			var insets = new D3D.Paths([], true);
 			for (var offset = wallThickness; offset <= shellThickness; offset += wallThickness) {
 				var inset = outerLayer.offset(-offset);
 
@@ -281,12 +288,19 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 			var lowFillArea = fillArea.difference(highFillArea);
 
-			var fill = new D3D.Paths([]);
+			var fill = new D3D.Paths([], false);
 
 			fill.join(lowFillTemplate.intersect(lowFillArea));
 
-			var highFillTemplate = this.getFillTemplate(dimensionsZ, wallThickness, (layer % 2 === 0), (layer % 2 === 1));
-			fill.join(highFillTemplate.intersect(highFillArea));
+			if (highFillArea.length > 0) {
+				var highFillTemplate = this.getFillTemplate(highFillArea.bounds(), wallThickness, (layer % 2 === 0), (layer % 2 === 1));
+				fill.join(highFillTemplate.intersect(highFillArea));
+			}
+
+			outerLayer = outerLayer.optimizePath(start);
+			insets = insets.optimizePath(outerLayer.lastPoint());
+			fill = fill.optimizePath(insets.lastPoint());
+			start = fill.lastPoint();
 
 			layerData.push({
 				outerLayer: outerLayer.scaleDown(scale),
@@ -298,19 +312,19 @@ D3D.Slicer.prototype.slicesToData = function (slices, printer) {
 
 	return data;
 };
-D3D.Slicer.prototype.getFillTemplate = function (dimension, size, even, uneven) {
+D3D.Slicer.prototype.getFillTemplate = function (bounds, size, even, uneven) {
 	"use strict";
 
 	var paths = new D3D.Paths([], false);
 
 	if (even) {
-		for (var length = 0; length <= dimension; length += size) {
-			paths.push([{X: length, Y: 0}, {X: length, Y: dimension}]);
+		for (var length = Math.floor(bounds.left); length <= Math.ceil(bounds.right); length += size) {
+			paths.push([{X: length, Y: bounds.top}, {X: length, Y: bounds.bottom}]);
 		}
 	}
 	if (uneven) {
-		for (var length = 0; length <= dimension; length += size) {
-			paths.push([{X: 0, Y: length}, {X: dimension, Y: length}]);
+		for (var length = Math.floor(bounds.top); length <= Math.floor(bounds.bottom); length += size) {
+			paths.push([{X: bounds.left, Y: length}, {X: bounds.right, Y: length}]);
 		}
 	}
 	
@@ -361,7 +375,7 @@ D3D.Slicer.prototype.dataToGcode = function (data, printer) {
 					gcode.push([
 						"G0", 
 						"X" + point.X.toFixed(3) + " Y" + point.Y.toFixed(3) + " Z" + z, 
-						"F" + (travelSpeed*60)
+						"F" + (travelSpeed * 60)
 					].join(" "));
 
 					if (extruder > retractionMinDistance && retractionEnabled) {