diff --git a/CAM/zoncoffee.GTO b/CAM/zoncoffee.GTO
--- a/CAM/zoncoffee.GTO
+++ b/CAM/zoncoffee.GTO
@@ -16,23 +16,23 @@ 5,1,8,0,0,1.08239X$1,22.5*
 %ADD16R,0.0050X0.0305*%
 %ADD17C,0.0160*%
 %ADD18R,0.0160X0.0280*%
-%ADD19R,0.0177X0.0177*%
-%ADD20R,0.0100X0.0020*%
-%ADD21R,0.0160X0.0020*%
-%ADD22R,0.0180X0.0020*%
-%ADD23R,0.0240X0.0020*%
-%ADD24R,0.0140X0.0020*%
-%ADD25R,0.0060X0.0020*%
-%ADD26R,0.0120X0.0020*%
-%ADD27R,0.0080X0.0020*%
-%ADD28R,0.0300X0.0020*%
-%ADD29R,0.0200X0.0020*%
-%ADD30R,0.0280X0.0020*%
-%ADD31R,0.0440X0.0020*%
-%ADD32R,0.0220X0.0020*%
-%ADD33R,0.0260X0.0020*%
-%ADD34R,0.0020X0.0020*%
-%ADD35R,0.0040X0.0020*%
+%ADD19R,0.0100X0.0020*%
+%ADD20R,0.0160X0.0020*%
+%ADD21R,0.0180X0.0020*%
+%ADD22R,0.0240X0.0020*%
+%ADD23R,0.0140X0.0020*%
+%ADD24R,0.0060X0.0020*%
+%ADD25R,0.0120X0.0020*%
+%ADD26R,0.0080X0.0020*%
+%ADD27R,0.0300X0.0020*%
+%ADD28R,0.0200X0.0020*%
+%ADD29R,0.0280X0.0020*%
+%ADD30R,0.0440X0.0020*%
+%ADD31R,0.0220X0.0020*%
+%ADD32R,0.0260X0.0020*%
+%ADD33R,0.0020X0.0020*%
+%ADD34R,0.0040X0.0020*%
+%ADD35C,0.0060*%
 D10*
 X004943Y002737D02*
 X005693Y002737D01*
@@ -1432,42 +1432,82 @@ X011120Y008201D01*
 X011255Y008201D02*
 X011300Y008156D01*
 X011300Y008021D01*
-X014255Y006800D02*
+X010999Y007689D02*
+X010924Y007689D01*
+X010849Y007614D01*
+X010849Y007464D01*
+X010774Y007389D01*
+X010699Y007389D01*
+X010623Y007464D01*
+X010623Y007614D01*
+X010699Y007689D01*
+X010774Y007689D01*
+X010849Y007614D01*
+X010849Y007464D02*
+X010924Y007389D01*
+X010999Y007389D01*
+X011074Y007464D01*
+X011074Y007614D01*
+X010999Y007689D01*
+X010999Y007229D02*
+X010924Y007229D01*
+X010849Y007154D01*
+X010849Y007004D01*
+X010774Y006929D01*
+X010699Y006929D01*
+X010623Y007004D01*
+X010623Y007154D01*
+X010699Y007229D01*
+X010548Y007079D02*
+X011149Y007079D01*
+X011074Y007154D02*
+X010999Y007229D01*
+X011074Y007154D02*
+X011074Y007004D01*
+X010999Y006929D01*
+X010999Y006768D02*
+X010623Y006768D01*
+X010623Y006468D02*
+X010999Y006468D01*
+X011074Y006543D01*
+X011074Y006693D01*
+X010999Y006768D01*
+X009230Y005406D02*
+X009185Y005361D01*
+X009005Y005361D01*
+X009050Y005316D02*
+X009050Y005406D01*
+X009050Y005205D02*
+X009050Y005160D01*
+X009140Y005070D01*
+X009230Y005070D02*
+X009050Y005070D01*
+X009095Y004956D02*
+X009230Y004956D01*
+X009230Y004820D01*
+X009185Y004775D01*
+X009140Y004820D01*
+X009140Y004956D01*
+X009095Y004956D02*
+X009050Y004911D01*
+X009050Y004820D01*
+X009050Y004661D02*
+X009230Y004661D01*
+X009230Y004526D01*
+X009185Y004481D01*
+X009050Y004481D01*
+X014255Y005300D02*
+X014255Y006800D01*
 X016255Y006800D01*
 X016255Y005300D01*
 X014255Y005300D01*
-X014255Y006800D01*
-X009543Y005406D02*
-X009498Y005361D01*
-X009318Y005361D01*
-X009363Y005316D02*
-X009363Y005406D01*
-X009363Y005205D02*
-X009363Y005160D01*
-X009453Y005070D01*
-X009543Y005070D02*
-X009363Y005070D01*
-X009408Y004956D02*
-X009543Y004956D01*
-X009543Y004820D01*
-X009498Y004775D01*
-X009453Y004820D01*
-X009453Y004956D01*
-X009408Y004956D02*
-X009363Y004911D01*
-X009363Y004820D01*
-X009363Y004661D02*
-X009543Y004661D01*
-X009543Y004526D01*
-X009498Y004481D01*
-X009363Y004481D01*
 D12*
+X013049Y006199D02*
+X012837Y006199D01*
 X012383Y006349D02*
 X012383Y006687D01*
-X012837Y006199D02*
-X013049Y006199D01*
-X013503Y006349D02*
-X013503Y006687D01*
+X013503Y006687D02*
+X013503Y006349D01*
 X015955Y007581D02*
 X015957Y007594D01*
 X015962Y007607D01*
@@ -1984,73 +2024,60 @@ X015255Y007749D02*
 X015255Y007725D01*
 X013892Y006612D02*
 X013868Y006612D01*
-X012943Y005499D02*
-X012943Y005475D01*
 X012880Y007756D02*
 X012880Y007780D01*
 X011974Y007780D02*
 X011974Y007756D01*
-X009755Y008538D02*
-X009755Y008562D01*
-X005068Y008280D02*
-X005068Y008256D01*
+X012943Y005405D02*
+X012943Y005381D01*
+X006693Y008225D02*
+X006693Y008249D01*
+X005068Y008256D02*
+X005068Y008280D01*
 X005068Y007655D02*
 X005068Y007631D01*
-X008255Y005655D02*
-X008255Y005631D01*
+X006255Y004905D02*
+X006255Y004881D01*
 D18*
 X005068Y005643D03*
 X019943Y008018D03*
 D19*
-X011038Y007582D03*
-D20*
-X018813Y004856D03*
-X018813Y004836D03*
-X018793Y004736D03*
-X018793Y004716D03*
-X018773Y004696D03*
-X018773Y004676D03*
-X018773Y004656D03*
-X018773Y004636D03*
-X018773Y004616D03*
-X018753Y004596D03*
-X018753Y004576D03*
-X018753Y004556D03*
-X018773Y004476D03*
-X018953Y004496D03*
-X018953Y004516D03*
-X018953Y004536D03*
-X018973Y004556D03*
-X018973Y004576D03*
-X018973Y004596D03*
-X018973Y004616D03*
-X018973Y004636D03*
-X018993Y004656D03*
+X019033Y004936D03*
+X019033Y004916D03*
+X019033Y004896D03*
+X019033Y004876D03*
+X019033Y004856D03*
+X019013Y004836D03*
+X019013Y004816D03*
+X018993Y004716D03*
+X018993Y004696D03*
 X018993Y004676D03*
-X018993Y004696D03*
-X018993Y004716D03*
-X019013Y004816D03*
-X019013Y004836D03*
-X019033Y004856D03*
-X019033Y004876D03*
-X019033Y004896D03*
-X019033Y004916D03*
-X019033Y004936D03*
-X019153Y004816D03*
-X019193Y004716D03*
+X018993Y004656D03*
+X018973Y004636D03*
+X018973Y004616D03*
+X018973Y004596D03*
+X018973Y004576D03*
+X018973Y004556D03*
+X018953Y004536D03*
+X018953Y004516D03*
+X018953Y004496D03*
+X019133Y004496D03*
+X019153Y004516D03*
+X019153Y004536D03*
+X019153Y004556D03*
+X019153Y004576D03*
+X019153Y004596D03*
+X019173Y004616D03*
+X019173Y004636D03*
+X019173Y004656D03*
+X019173Y004676D03*
 X019173Y004696D03*
-X019173Y004676D03*
-X019173Y004656D03*
-X019173Y004636D03*
-X019173Y004616D03*
-X019153Y004596D03*
-X019153Y004576D03*
-X019153Y004556D03*
-X019153Y004536D03*
-X019153Y004516D03*
-X019133Y004496D03*
+X019193Y004716D03*
+X019153Y004816D03*
+X019353Y004716D03*
+X019373Y004736D03*
+X019333Y004636D03*
 X019313Y004596D03*
-X019333Y004636D03*
 X019333Y004556D03*
 X019393Y004476D03*
 X019653Y004496D03*
@@ -2068,8 +2095,10 @@ X019693Y004716D03*
 X019533Y004716D03*
 X019533Y004736D03*
 X019473Y004816D03*
-X019373Y004736D03*
-X019353Y004716D03*
+X019913Y004716D03*
+X019913Y004696D03*
+X019913Y004676D03*
+X019913Y004656D03*
 X019893Y004636D03*
 X019893Y004616D03*
 X019893Y004596D03*
@@ -2078,18 +2107,14 @@ X019893Y004556D03*
 X019873Y004536D03*
 X019873Y004516D03*
 X019873Y004496D03*
-X019913Y004656D03*
-X019913Y004676D03*
-X019913Y004696D03*
-X019913Y004716D03*
-X020073Y004636D03*
+X020053Y004496D03*
+X020053Y004516D03*
+X020053Y004536D03*
+X020073Y004556D03*
+X020073Y004576D03*
+X020073Y004596D03*
 X020073Y004616D03*
-X020073Y004596D03*
-X020073Y004576D03*
-X020073Y004556D03*
-X020053Y004536D03*
-X020053Y004516D03*
-X020053Y004496D03*
+X020073Y004636D03*
 X020093Y004656D03*
 X020093Y004676D03*
 X020093Y004696D03*
@@ -2108,62 +2133,75 @@ X020273Y004696D03*
 X020273Y004716D03*
 X020273Y004736D03*
 X020653Y004796D03*
-D21*
-X020243Y004796D03*
+X018813Y004836D03*
+X018813Y004856D03*
+X018793Y004736D03*
+X018793Y004716D03*
+X018773Y004696D03*
+X018773Y004676D03*
+X018773Y004656D03*
+X018773Y004636D03*
+X018773Y004616D03*
+X018753Y004596D03*
+X018753Y004576D03*
+X018753Y004556D03*
+X018773Y004476D03*
+D20*
+X018783Y004496D03*
+X018783Y004516D03*
 X019463Y004796D03*
-X018783Y004516D03*
-X018783Y004496D03*
-D22*
+X020243Y004796D03*
+D21*
+X019753Y004796D03*
+X019733Y004776D03*
+X019733Y004756D03*
+X019733Y004736D03*
+X019393Y004496D03*
 X018813Y004776D03*
 X018813Y004796D03*
-X019393Y004496D03*
-X019733Y004736D03*
-X019733Y004756D03*
-X019733Y004776D03*
-X019753Y004796D03*
-D23*
+D22*
 X019403Y004536D03*
 X019403Y004516D03*
-D24*
+D23*
 X019013Y004736D03*
 X018773Y004536D03*
 X019933Y004736D03*
 X020113Y004736D03*
-D25*
+D24*
 X019813Y004816D03*
 X019493Y004556D03*
 X020453Y004796D03*
 X020653Y004956D03*
-D26*
+D25*
 X019523Y004756D03*
 X019383Y004756D03*
 X019323Y004576D03*
 X019183Y004736D03*
 X018803Y004816D03*
-D27*
+D26*
 X018823Y004876D03*
 X019043Y004956D03*
 X019323Y004616D03*
 X020083Y004816D03*
 X020243Y004816D03*
-D28*
+D27*
 X019433Y004696D03*
 X019433Y004676D03*
 X019433Y004656D03*
-D29*
+D28*
 X018803Y004756D03*
-D30*
+D29*
 X019103Y004756D03*
 X019103Y004776D03*
-D31*
+D30*
 X020103Y004776D03*
 X020103Y004756D03*
-D32*
+D31*
 X019453Y004776D03*
-D33*
+D32*
 X019093Y004796D03*
 X020013Y004796D03*
-D34*
+D33*
 X020413Y004836D03*
 X020413Y004856D03*
 X020413Y004876D03*
@@ -2184,8 +2222,63 @@ X020673Y004876D03*
 X020693Y004896D03*
 X020693Y004916D03*
 X020693Y004936D03*
-D35*
+D34*
 X020643Y004836D03*
 X020483Y004936D03*
 X020463Y004956D03*
+D35*
+X009904Y005446D02*
+X009827Y005370D01*
+X007433Y005370D01*
+X007357Y005446D01*
+X007357Y007840D01*
+X007433Y007917D01*
+X009827Y007917D01*
+X009904Y007840D01*
+X009904Y005446D01*
+X009376Y007576D02*
+X009378Y007603D01*
+X009384Y007629D01*
+X009393Y007654D01*
+X009406Y007677D01*
+X009422Y007698D01*
+X009441Y007717D01*
+X009462Y007733D01*
+X009485Y007746D01*
+X009510Y007755D01*
+X009536Y007761D01*
+X009563Y007763D01*
+X009590Y007761D01*
+X009616Y007755D01*
+X009641Y007746D01*
+X009664Y007733D01*
+X009685Y007717D01*
+X009704Y007698D01*
+X009720Y007677D01*
+X009733Y007654D01*
+X009742Y007629D01*
+X009748Y007603D01*
+X009750Y007576D01*
+X009748Y007549D01*
+X009742Y007523D01*
+X009733Y007498D01*
+X009720Y007475D01*
+X009704Y007454D01*
+X009685Y007435D01*
+X009664Y007419D01*
+X009641Y007406D01*
+X009616Y007397D01*
+X009590Y007391D01*
+X009563Y007389D01*
+X009536Y007391D01*
+X009510Y007397D01*
+X009485Y007406D01*
+X009462Y007419D01*
+X009441Y007435D01*
+X009422Y007454D01*
+X009406Y007475D01*
+X009393Y007498D01*
+X009384Y007523D01*
+X009378Y007549D01*
+X009376Y007576D01*
 M02*