diff --git a/CAM/zoncoffee.GTL b/CAM/zoncoffee.GTL
--- a/CAM/zoncoffee.GTL
+++ b/CAM/zoncoffee.GTL
@@ -18,13 +18,14 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD18C,0.0118*%
 %ADD19R,0.0600X0.0600*%
 %ADD20R,0.0276X0.0197*%
-%ADD21R,0.0276X0.0354*%
-%ADD22R,0.0354X0.0276*%
-%ADD23R,0.0276X0.0177*%
-%ADD24R,0.0197X0.0571*%
-%ADD25R,0.0571X0.0197*%
-%ADD26C,0.0240*%
-%ADD27C,0.0080*%
+%ADD21R,0.0433X0.0394*%
+%ADD22R,0.0276X0.0354*%
+%ADD23R,0.0354X0.0276*%
+%ADD24R,0.0276X0.0177*%
+%ADD25R,0.0197X0.0571*%
+%ADD26R,0.0571X0.0197*%
+%ADD27C,0.0240*%
+%ADD28C,0.0080*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1488,16 +1489,17 @@ D20*
 X017207Y008643D03*
 X017718Y008643D03*
 D21*
+X013309Y007675D03*
+X012639Y007675D03*
+D22*
+X012043Y007706D03*
+X011531Y007706D03*
+X014999Y007737D03*
+X015511Y007737D03*
 X019687Y008018D03*
 X020199Y008018D03*
-X015511Y007737D03*
-X014999Y007737D03*
-X013136Y007768D03*
-X012624Y007768D03*
-X012230Y007768D03*
-X011718Y007768D03*
+X013199Y005393D03*
 X012687Y005393D03*
-X013199Y005393D03*
 X006949Y008237D03*
 X006437Y008237D03*
 X005324Y008268D03*
@@ -1508,10 +1510,10 @@ X005324Y005643D03*
 X004812Y005643D03*
 X005999Y004893D03*
 X006511Y004893D03*
-D22*
+D23*
 X013880Y006356D03*
 X013880Y006868D03*
-D23*
+D24*
 X005373Y006801D03*
 X005373Y006486D03*
 X005373Y006171D03*
@@ -1520,7 +1522,7 @@ X004763Y006486D03*
 X004763Y006801D03*
 X004763Y007116D03*
 X005373Y007116D03*
-D24*
+D25*
 X007528Y008257D03*
 X007843Y008257D03*
 X008158Y008257D03*
@@ -1537,7 +1539,7 @@ X008473Y005029D03*
 X008158Y005029D03*
 X007843Y005029D03*
 X007528Y005029D03*
-D25*
+D26*
 X007016Y005541D03*
 X007016Y005856D03*
 X007016Y006171D03*
@@ -1554,7 +1556,7 @@ X010245Y006486D03*
 X010245Y006171D03*
 X010245Y005856D03*
 X010245Y005541D03*
-D26*
+D27*
 X011130Y005393D03*
 X012224Y006175D03*
 X011974Y006425D03*
@@ -1562,13 +1564,12 @@ X011755Y006675D03*
 X011505Y006925D03*
 X011318Y007206D03*
 X011099Y007456D03*
-X010849Y007706D03*
-X009630Y007643D03*
-X009130Y007643D03*
-X008474Y007800D03*
-X009037Y007143D03*
-X009287Y006862D03*
-X008380Y006550D03*
+X009724Y007737D03*
+X009162Y007675D03*
+X009693Y007393D03*
+X009162Y006893D03*
+X008755Y007143D03*
+X008380Y006643D03*
 X008630Y006300D03*
 X009099Y006018D03*
 X009412Y006143D03*
@@ -1578,7 +1579,7 @@ X008474Y005518D03*
 X006162Y005737D03*
 X006005Y005456D03*
 X005693Y005956D03*
-X006193Y006081D03*
+X006193Y006143D03*
 X005818Y006456D03*
 X006099Y006612D03*
 X005755Y006831D03*
@@ -1586,8 +1587,9 @@ X005693Y007331D03*
 X005693Y007643D03*
 X005693Y007956D03*
 X005693Y008268D03*
-X006068Y008362D03*
-X006349Y008643D03*
+X006005Y008393D03*
+X006443Y008643D03*
+X008474Y007800D03*
 X004787Y005268D03*
 X005380Y004893D03*
 X012662Y005020D03*
@@ -1601,12 +1603,12 @@ X016005Y006300D03*
 X017255Y006487D03*
 X017662Y006112D03*
 X018068Y005706D03*
+X019568Y006262D03*
+X019818Y006018D03*
 X019130Y006800D03*
-X018755Y007143D03*
+X018693Y007081D03*
 X018318Y007550D03*
-X019818Y006637D03*
-X020068Y006393D03*
-X020130Y007143D03*
+X020130Y007518D03*
 X020662Y007956D03*
 X020755Y008362D03*
 X021130Y008419D03*
@@ -1614,10 +1616,10 @@ X021912Y008393D03*
 X018193Y008643D03*
 X016693Y008643D03*
 X014474Y007925D03*
-X013443Y007768D03*
+X013943Y007768D03*
 X020630Y005081D03*
 X021130Y005112D03*
-D27*
+D28*
 X021649Y005112D01*
 X021693Y005069D01*
 X021705Y005069D01*
@@ -1629,23 +1631,16 @@ X021119Y006131D01*
 X020650Y006131D01*
 X020650Y006387D02*
 X020644Y006393D01*
-X020068Y006393D01*
-X019818Y006637D02*
+X020193Y006393D01*
+X019818Y006018D01*
+X019568Y006262D02*
+X019943Y006637D01*
 X020643Y006637D01*
 X020650Y006643D01*
 X020650Y007155D02*
-X020142Y007155D01*
-X020130Y007143D01*
-X019508Y007177D02*
-X019130Y006800D01*
-X018755Y007143D02*
-X019118Y007506D01*
-X019118Y007569D01*
-X018729Y007959D02*
-X018727Y007959D01*
-X018318Y007550D01*
-X019508Y007179D02*
-X019508Y007177D01*
+X020212Y007155D01*
+X020130Y007237D01*
+X020130Y007518D01*
 X020261Y007956D02*
 X020199Y008018D01*
 X020193Y008012D01*
@@ -1658,63 +1653,255 @@ X019687Y008429D02*
 X019598Y008518D01*
 X019687Y008429D02*
 X019687Y008018D01*
-X021130Y008419D02*
-X021130Y006143D01*
-X018068Y005706D02*
-X017690Y005328D01*
-X017657Y005328D01*
-X017627Y005328D01*
-X017267Y005718D02*
-X017662Y006112D01*
-X017255Y006485D02*
-X017255Y006487D01*
-X017255Y006485D02*
-X016877Y006107D01*
-X016005Y006300D02*
-X016005Y006581D01*
-X016005Y007109D01*
-X015505Y007109D02*
-X015505Y007731D01*
-X015511Y007737D01*
+X019118Y007569D02*
+X019118Y007506D01*
+X018693Y007081D01*
+X019130Y006800D02*
+X019508Y007177D01*
+X019508Y007179D01*
+X018727Y007959D02*
+X018318Y007550D01*
+X018727Y007959D02*
+X018729Y007959D01*
+X018193Y008643D02*
+X017718Y008643D01*
+X017207Y008643D02*
+X016693Y008643D01*
+X015943Y008393D02*
 X015511Y007962D01*
-X015943Y008393D01*
-X016693Y008643D02*
-X017207Y008643D01*
-X017718Y008643D02*
-X018193Y008643D01*
-X014999Y008337D02*
+X015511Y007737D01*
+X015505Y007731D01*
+X015505Y007109D01*
+X015005Y007109D02*
+X015005Y007731D01*
 X014999Y007737D01*
-X015005Y007731D01*
-X015005Y007109D01*
-X014505Y007109D02*
-X014471Y007143D01*
-X013943Y007143D01*
-X013880Y007081D01*
+X014999Y008337D01*
+X014943Y008393D01*
+X014474Y007925D02*
+X013943Y007393D01*
+X013818Y007393D01*
+X013568Y007143D01*
+X013318Y007143D01*
+X013317Y007142D01*
+X013317Y007030D01*
+X013317Y006705D01*
+X013255Y006643D01*
+X012630Y006643D01*
+X012568Y006706D01*
+X012568Y007031D01*
+X012569Y007030D01*
+X012569Y007604D01*
+X012639Y007675D01*
+X012639Y008215D01*
+X012818Y008393D01*
+X012043Y008044D02*
+X011693Y008393D01*
+X012043Y008044D02*
+X012043Y007706D01*
+X011531Y007706D02*
+X011531Y007430D01*
+X012537Y006425D01*
+X013318Y006425D01*
+X013437Y006425D01*
 X013880Y006868D01*
-X013437Y006425D01*
+X013880Y007081D01*
+X013943Y007143D01*
+X014471Y007143D01*
+X014505Y007109D01*
+X014380Y006581D02*
+X014156Y006356D01*
+X013880Y006356D01*
+X014380Y006581D02*
+X016005Y006581D01*
+X016005Y006300D01*
+X015505Y006300D02*
+X015505Y004983D01*
+X015005Y004983D02*
+X015005Y006300D01*
+X014474Y006112D02*
+X014474Y005014D01*
+X014505Y004983D01*
+X014005Y005362D02*
+X013318Y004675D01*
+X012474Y004675D01*
+X011755Y005393D01*
+X011130Y005393D01*
+X010590Y005541D02*
+X011224Y006175D01*
+X012224Y006175D01*
+X011974Y006425D02*
+X011130Y006425D01*
+X010562Y005856D01*
+X010245Y005856D01*
+X010245Y006171D02*
+X010595Y006171D01*
+X011099Y006675D01*
+X011755Y006675D01*
+X011505Y006925D02*
+X011037Y006925D01*
+X010598Y006486D01*
+X010245Y006486D01*
+X010245Y006801D02*
+X010600Y006801D01*
+X011005Y007206D01*
+X011318Y007206D01*
+X011099Y007456D02*
+X010943Y007456D01*
+X010603Y007116D01*
+X010245Y007116D01*
+X010245Y007431D02*
+X010668Y007431D01*
+X010755Y007518D01*
+X010755Y007643D01*
+X010662Y007737D01*
+X010253Y007737D01*
+X010245Y007746D01*
+X009733Y007746D01*
+X009724Y007737D01*
+X009418Y007668D02*
+X009693Y007393D01*
+X009418Y007668D02*
+X009418Y008257D01*
+X009733Y008257D02*
+X009744Y008268D01*
+X009974Y008268D01*
+X010287Y007956D01*
+X011037Y007956D01*
+X011287Y007706D01*
+X011531Y007706D01*
+X012943Y007309D02*
+X012943Y007030D01*
+X012943Y007309D02*
+X013309Y007675D01*
+X013849Y007675D01*
+X013943Y007768D01*
+X016005Y007109D02*
+X016005Y006581D01*
+X016877Y006107D02*
+X017255Y006485D01*
+X017255Y006487D01*
+X017662Y006112D02*
+X017267Y005718D01*
+X017627Y005328D02*
+X017657Y005328D01*
+X017690Y005328D01*
+X018068Y005706D01*
+X021130Y006143D02*
+X021130Y008419D01*
+X021693Y008218D02*
+X021705Y008206D01*
+X021755Y008206D01*
+X021755Y008237D01*
+X021912Y008393D01*
+X014193Y005675D02*
+X013974Y005675D01*
+X013319Y005020D01*
+X012662Y005020D01*
+X012687Y005393D02*
+X012687Y005450D01*
+X013130Y005893D01*
+X013318Y005893D01*
+X013297Y005914D01*
+X013297Y005987D01*
+X013317Y006006D01*
+X013318Y006007D01*
 X013318Y006425D01*
-X012537Y006425D01*
-X011724Y007237D01*
-X011724Y007762D01*
-X011718Y007768D01*
-X011224Y007768D01*
-X011037Y007956D01*
-X009849Y007956D01*
-X009787Y008018D01*
-X009787Y008204D01*
-X009733Y008257D01*
-X009733Y008666D01*
-X009662Y008737D01*
+X013297Y005987D02*
+X013287Y005976D01*
+X013724Y005768D02*
+X013349Y005393D01*
+X013199Y005393D01*
+X010590Y005541D02*
+X010245Y005541D01*
+X009724Y005038D02*
+X009733Y005029D01*
+X009724Y005038D02*
+X009724Y006268D01*
+X009412Y006143D02*
+X009412Y005035D01*
+X009418Y005029D01*
+X009103Y005029D02*
+X009099Y005033D01*
+X009099Y006018D01*
+X008788Y005736D02*
+X008788Y005029D01*
+X008473Y005029D02*
+X008473Y005517D01*
+X008474Y005518D01*
+X008787Y005737D02*
+X008788Y005736D01*
+X008630Y006300D02*
+X008381Y006300D01*
+X007537Y005455D01*
+X007537Y005038D01*
+X007528Y005029D01*
+X007528Y004902D01*
+X007537Y004893D01*
+X006511Y004893D01*
+X006037Y004930D02*
+X005999Y004893D01*
+X005380Y004893D01*
+X006037Y004930D02*
+X006037Y005175D01*
+X006403Y005541D01*
+X007016Y005541D01*
+X006568Y006143D02*
+X006162Y005737D01*
+X006005Y005456D02*
+X005818Y005643D01*
+X005324Y005643D01*
+X004812Y005643D02*
+X004787Y005669D01*
+X004787Y005700D01*
+X004763Y005693D02*
+X004812Y005643D01*
+X004787Y005669D02*
+X004787Y005268D01*
+X004763Y005693D02*
+X004763Y006171D01*
+X004763Y006801D01*
+X004763Y006486D01*
+X004763Y006171D01*
+X005373Y006171D02*
+X005665Y006171D01*
+X005693Y006143D01*
+X005693Y005956D01*
+X006193Y006143D02*
+X006380Y006331D01*
+X006380Y007183D01*
+X006628Y007431D01*
+X007016Y007431D01*
+X007016Y007116D02*
+X008728Y007116D01*
+X008755Y007143D01*
+X009020Y007393D02*
+X009412Y007002D01*
+X009412Y006737D01*
+X009318Y006643D01*
+X008380Y006643D01*
+X008193Y006893D02*
+X009162Y006893D01*
+X009020Y007393D02*
+X007880Y007393D01*
+X007528Y007746D01*
+X007528Y008257D01*
+X007843Y008257D02*
+X007843Y007780D01*
+X008073Y007550D01*
+X009037Y007550D01*
+X009162Y007675D01*
+X008474Y007800D02*
+X008474Y008256D01*
+X008473Y008257D01*
 X008473Y008737D01*
 X007099Y008737D01*
 X006974Y008612D01*
 X006974Y008262D01*
 X006949Y008237D01*
-X006437Y008237D02*
-X006437Y008555D01*
-X006349Y008643D01*
-X006068Y008362D02*
-X005849Y008581D01*
+X006443Y008243D02*
+X006443Y008643D01*
+X006005Y008393D02*
+X005818Y008581D01*
 X004880Y008581D01*
 X004818Y008518D01*
 X004818Y008274D01*
@@ -1739,207 +1926,29 @@ X005373Y006486D02*
 X005788Y006486D01*
 X005818Y006456D01*
 X006099Y006612D02*
-X006099Y007639D01*
-X006206Y007746D01*
+X006099Y007253D01*
+X006591Y007746D01*
 X007016Y007746D01*
-X007528Y007746D02*
-X007880Y007393D01*
-X009380Y007393D01*
-X009568Y007206D01*
-X009568Y006737D01*
-X009380Y006550D01*
-X008380Y006550D01*
-X008630Y006300D02*
-X008031Y006300D01*
-X007537Y005805D01*
-X007537Y005038D01*
-X007528Y005029D01*
-X007528Y004902D01*
-X007537Y004893D01*
-X006511Y004893D01*
-X006037Y004930D02*
-X005999Y004893D01*
-X005380Y004893D01*
-X006037Y004930D02*
-X006037Y005175D01*
-X006403Y005541D01*
-X007016Y005541D01*
-X006474Y006050D02*
-X006162Y005737D01*
-X006005Y005456D02*
-X005818Y005643D01*
-X005324Y005643D01*
-X004812Y005643D02*
-X004787Y005669D01*
-X004787Y005700D01*
-X004763Y005693D02*
-X004812Y005643D01*
-X004787Y005669D02*
-X004787Y005268D01*
-X004763Y005693D02*
-X004763Y006171D01*
+X006443Y008243D02*
+X006437Y008237D01*
+X004763Y007116D02*
 X004763Y006801D01*
-X004763Y006486D01*
-X004763Y006171D01*
-X005373Y006171D02*
-X005665Y006171D01*
-X005693Y006143D01*
-X005693Y005956D01*
-X006193Y006081D02*
-X006318Y006206D01*
-X006318Y006518D01*
-X006443Y006643D01*
-X006443Y007382D01*
-X006492Y007431D01*
-X007016Y007431D01*
-X007016Y007116D02*
-X008978Y007116D01*
-X009037Y007143D01*
-X009287Y006862D02*
-X007192Y006863D01*
-X007016Y006801D01*
-X007016Y006486D02*
-X006537Y006486D01*
-X006474Y006423D01*
-X006473Y006423D01*
-X006474Y006112D01*
-X006474Y006050D01*
-X004763Y006801D02*
-X004763Y007116D01*
-X007528Y007746D02*
-X007528Y008257D01*
-X007843Y008257D02*
-X007843Y007780D01*
-X008073Y007550D01*
-X009037Y007550D01*
-X009130Y007643D01*
-X009630Y007643D02*
-X009733Y007746D01*
-X010245Y007746D01*
-X010574Y007431D02*
-X010849Y007706D01*
-X010943Y007456D02*
-X010603Y007116D01*
-X010245Y007116D01*
-X010245Y007431D02*
-X010574Y007431D01*
-X010943Y007456D02*
-X011099Y007456D01*
-X011005Y007206D02*
-X010600Y006801D01*
-X010245Y006801D01*
-X010245Y006486D02*
-X010598Y006486D01*
-X011037Y006925D01*
-X011505Y006925D01*
-X011755Y006675D02*
-X011099Y006675D01*
-X010595Y006171D01*
-X010245Y006171D01*
-X010245Y005856D02*
-X010562Y005856D01*
-X011130Y006425D01*
-X011974Y006425D01*
-X012224Y006175D02*
-X011224Y006175D01*
-X010590Y005541D01*
-X010245Y005541D01*
-X011130Y005393D02*
-X011755Y005393D01*
-X012474Y004675D01*
-X013318Y004675D01*
-X014005Y005362D01*
-X013974Y005675D02*
-X014193Y005675D01*
-X013974Y005675D02*
-X013319Y005020D01*
-X012662Y005020D01*
-X012687Y005393D02*
-X012687Y005450D01*
-X013130Y005893D01*
-X013318Y005893D01*
-X013297Y005914D01*
-X013297Y005987D01*
-X013317Y006006D01*
-X013318Y006007D01*
-X013318Y006425D01*
-X013255Y006643D02*
-X012630Y006643D01*
-X012568Y006706D01*
-X012568Y007031D01*
-X012569Y007030D01*
-X012569Y007713D01*
-X012624Y007768D01*
-X012624Y008200D01*
-X012818Y008393D01*
-X012230Y008277D02*
-X012114Y008393D01*
-X011693Y008393D01*
-X012230Y008277D02*
-X012230Y007768D01*
-X012943Y007331D02*
-X013130Y007518D01*
-X013130Y007762D01*
-X013136Y007768D01*
-X013443Y007768D01*
-X013317Y007330D02*
-X013912Y007925D01*
-X014474Y007925D01*
-X014943Y008393D02*
-X014999Y008337D01*
-X013317Y007330D02*
-X013317Y007030D01*
-X013317Y006705D01*
-X013255Y006643D01*
-X013880Y006356D02*
-X014156Y006356D01*
-X014380Y006581D01*
-X016005Y006581D01*
-X015505Y006300D02*
-X015505Y004983D01*
-X015005Y004983D02*
-X015005Y006300D01*
-X014474Y006112D02*
-X014474Y005014D01*
-X014505Y004983D01*
-X013724Y005768D02*
-X013349Y005393D01*
-X013199Y005393D01*
-X013287Y005976D02*
-X013297Y005987D01*
-X012943Y007030D02*
-X012943Y007331D01*
-X011318Y007206D02*
-X011005Y007206D01*
-X009724Y006268D02*
-X009724Y005038D01*
-X009733Y005029D01*
-X009418Y005029D02*
-X009412Y005035D01*
-X009412Y006143D01*
-X009099Y006018D02*
-X009099Y005033D01*
-X009103Y005029D01*
-X008788Y005029D02*
-X008788Y005676D01*
-X008787Y005737D01*
-X008474Y005518D02*
-X008473Y005517D01*
-X008473Y005029D01*
-X008162Y005025D02*
-X008158Y005029D01*
-X008162Y005025D02*
+X006568Y006423D02*
+X006568Y006143D01*
+X006568Y006423D02*
+X006630Y006486D01*
+X007016Y006486D01*
+X007016Y006801D02*
+X008100Y006801D01*
+X008193Y006893D01*
+X009733Y008257D02*
+X009733Y008666D01*
+X009662Y008737D01*
+X008473Y008737D01*
+X008158Y005029D02*
+X008162Y005025D01*
 X008162Y004612D01*
 X008224Y004550D01*
 X010099Y004550D01*
 X010349Y004800D01*
-X008474Y007800D02*
-X008474Y008256D01*
-X008473Y008257D01*
-X008473Y008737D01*
-X021693Y008218D02*
-X021705Y008206D01*
-X021755Y008206D01*
-X021755Y008237D01*
-X021912Y008393D01*
 M02*