diff --git a/CAM/hab.GTP b/CAM/hab.GTP
--- a/CAM/hab.GTP
+++ b/CAM/hab.GTP
@@ -1,155 +1,299 @@
-G75*
-%MOIN*%
-%OFA0B0*%
-%FSLAX25Y25*%
-%IPPOS*%
-%LPD*%
-%AMOC8*
-5,1,8,0,0,1.08239X$1,22.5*
-%
-%ADD10R,0.10630X0.10630*%
-%ADD11R,0.02756X0.00984*%
-%ADD12R,0.00984X0.02756*%
-%ADD13R,0.02756X0.03543*%
-%ADD14R,0.03543X0.02756*%
-%ADD15R,0.03425X0.03071*%
-%ADD16R,0.05000X0.10000*%
-%ADD17R,0.03150X0.03543*%
-%ADD18C,0.00886*%
-D10*
-X0095053Y0118829D03*
-D11*
-X0087297Y0118829D03*
-X0087297Y0120797D03*
-X0087297Y0122766D03*
-X0087297Y0116860D03*
-X0087297Y0114892D03*
-X0102809Y0114892D03*
-X0102809Y0116860D03*
-X0102809Y0118829D03*
-X0102809Y0120797D03*
-X0102809Y0122766D03*
-D12*
-X0098990Y0126585D03*
-X0097022Y0126585D03*
-X0095053Y0126585D03*
-X0093085Y0126585D03*
-X0091116Y0126585D03*
-X0091116Y0111073D03*
-X0093085Y0111073D03*
-X0095053Y0111073D03*
-X0097022Y0111073D03*
-X0098990Y0111073D03*
-D13*
-X0100430Y0107084D03*
-X0096862Y0107035D03*
-X0091744Y0107035D03*
-X0087582Y0106747D03*
-X0082464Y0106747D03*
-X0082593Y0112427D03*
-X0077474Y0112427D03*
-X0077646Y0122022D03*
-X0082764Y0122022D03*
-X0107935Y0120075D03*
-X0107760Y0115632D03*
-X0107735Y0111009D03*
-X0105548Y0107084D03*
-X0112853Y0111009D03*
-X0112878Y0115632D03*
-X0113053Y0120075D03*
-X0113316Y0125758D03*
-X0108198Y0125758D03*
-X0097668Y0102674D03*
-X0092549Y0102674D03*
-X0092378Y0097776D03*
-X0091757Y0093393D03*
-X0095528Y0093203D03*
-X0100646Y0093203D03*
-X0097496Y0097776D03*
-X0086639Y0093393D03*
-X0087859Y0088725D03*
-X0082741Y0088725D03*
-X0092103Y0088700D03*
-X0097222Y0088700D03*
-X0110191Y0100000D03*
-X0115309Y0100000D03*
-X0114022Y0150763D03*
-X0108903Y0150763D03*
-X0081559Y0152500D03*
-X0076441Y0152500D03*
-D14*
-X0082800Y0102534D03*
-X0088231Y0102822D03*
-X0088231Y0097704D03*
-X0082800Y0097416D03*
-D15*
-X0082159Y0129222D03*
-X0076805Y0129222D03*
-X0076805Y0141152D03*
-X0082159Y0141152D03*
-D16*
-X0091450Y0081175D03*
-X0097162Y0081225D03*
-X0102850Y0081175D03*
-D17*
-X0112112Y0086944D03*
-X0108372Y0095212D03*
-X0115853Y0095212D03*
-D18*
-X0100890Y0134323D02*
-X0100890Y0135898D01*
-X0098921Y0135898D02*
-X0098921Y0134323D01*
-X0096953Y0134323D02*
-X0096953Y0135898D01*
-X0094984Y0135898D02*
-X0094984Y0134323D01*
-X0093016Y0134323D02*
-X0093016Y0135898D01*
-X0091047Y0135898D02*
-X0091047Y0134323D01*
-X0089079Y0134323D02*
-X0089079Y0135898D01*
-X0087504Y0137473D02*
-X0085929Y0137473D01*
-X0085929Y0139441D02*
-X0087504Y0139441D01*
-X0087504Y0141410D02*
-X0085929Y0141410D01*
-X0085929Y0143378D02*
-X0087504Y0143378D01*
-X0087504Y0145347D02*
-X0085929Y0145347D01*
-X0085929Y0147315D02*
-X0087504Y0147315D01*
-X0087504Y0149284D02*
-X0085929Y0149284D01*
-X0089079Y0150859D02*
-X0089079Y0152433D01*
-X0091047Y0152433D02*
-X0091047Y0150859D01*
-X0093016Y0150859D02*
-X0093016Y0152433D01*
-X0094984Y0152433D02*
-X0094984Y0150859D01*
-X0096953Y0150859D02*
-X0096953Y0152433D01*
-X0098921Y0152433D02*
-X0098921Y0150859D01*
-X0100890Y0150859D02*
-X0100890Y0152433D01*
-X0102465Y0149284D02*
-X0104039Y0149284D01*
-X0104039Y0147315D02*
-X0102465Y0147315D01*
-X0102465Y0145347D02*
-X0104039Y0145347D01*
-X0104039Y0143378D02*
-X0102465Y0143378D01*
-X0102465Y0141410D02*
-X0104039Y0141410D01*
-X0104039Y0139441D02*
-X0102465Y0139441D01*
-X0102465Y0137473D02*
-X0104039Y0137473D01*
-M02*
+G75*
+%MOIN*%
+%OFA0B0*%
+%FSLAX24Y24*%
+%IPPOS*%
+%LPD*%
+%AMOC8*
+5,1,8,0,0,1.08239X$1,22.5*
+%
+%ADD10C,0.0000*%
+%ADD11R,0.1063X0.1063*%
+%ADD12R,0.0276X0.0098*%
+%ADD13R,0.0098X0.0276*%
+%ADD14R,0.0276X0.0354*%
+%ADD15R,0.0354X0.0276*%
+%ADD16R,0.0343X0.0307*%
+%ADD17R,0.0500X0.1000*%
+%ADD18R,0.0315X0.0354*%
+%ADD19C,0.0089*%
+D10*
+X007150Y007500D02*
+X007150Y015875D01*
+X008619Y015875D01*
+X008619Y016168D01*
+X008619Y016169D02*
+X008622Y016222D01*
+X008629Y016275D01*
+X008639Y016328D01*
+X008652Y016380D01*
+X008670Y016431D01*
+X008690Y016480D01*
+X008714Y016528D01*
+X008742Y016574D01*
+X008772Y016618D01*
+X008805Y016660D01*
+X008841Y016700D01*
+X008880Y016737D01*
+X008921Y016772D01*
+X008964Y016803D01*
+X009010Y016832D01*
+X009057Y016857D01*
+X009106Y016879D01*
+X009156Y016898D01*
+X009207Y016913D01*
+X009260Y016925D01*
+X009313Y016933D01*
+X009366Y016937D01*
+X009420Y016938D01*
+X009419Y016938D02*
+X009556Y016938D01*
+X009555Y016938D02*
+X009612Y016937D01*
+X009668Y016932D01*
+X009724Y016924D01*
+X009780Y016911D01*
+X009834Y016895D01*
+X009887Y016875D01*
+X009938Y016852D01*
+X009988Y016825D01*
+X010036Y016795D01*
+X010082Y016762D01*
+X010125Y016725D01*
+X010166Y016686D01*
+X010204Y016644D01*
+X010239Y016600D01*
+X010271Y016553D01*
+X010300Y016504D01*
+X010325Y016454D01*
+X010347Y016401D01*
+X010365Y016348D01*
+X010379Y016293D01*
+X010390Y016237D01*
+X010397Y016181D01*
+X010400Y016125D01*
+X010400Y016124D02*
+X010400Y015875D01*
+X015584Y015875D01*
+X015584Y014503D01*
+X011900Y014503D01*
+X011900Y014250D01*
+X011898Y007500D01*
+X007150Y007500D01*
+X008875Y016064D02*
+X008877Y016114D01*
+X008883Y016163D01*
+X008893Y016212D01*
+X008906Y016259D01*
+X008924Y016306D01*
+X008945Y016351D01*
+X008969Y016394D01*
+X008997Y016435D01*
+X009028Y016474D01*
+X009062Y016510D01*
+X009099Y016544D01*
+X009139Y016574D01*
+X009180Y016601D01*
+X009224Y016625D01*
+X009269Y016645D01*
+X009316Y016661D01*
+X009364Y016674D01*
+X009413Y016683D01*
+X009463Y016688D01*
+X009512Y016689D01*
+X009562Y016686D01*
+X009611Y016679D01*
+X009660Y016668D01*
+X009707Y016654D01*
+X009753Y016635D01*
+X009798Y016613D01*
+X009841Y016588D01*
+X009881Y016559D01*
+X009919Y016527D01*
+X009955Y016493D01*
+X009988Y016455D01*
+X010017Y016415D01*
+X010043Y016373D01*
+X010066Y016329D01*
+X010085Y016283D01*
+X010101Y016236D01*
+X010113Y016187D01*
+X010121Y016138D01*
+X010125Y016089D01*
+X010125Y016039D01*
+X010121Y015990D01*
+X010113Y015941D01*
+X010101Y015892D01*
+X010085Y015845D01*
+X010066Y015799D01*
+X010043Y015755D01*
+X010017Y015713D01*
+X009988Y015673D01*
+X009955Y015635D01*
+X009919Y015601D01*
+X009881Y015569D01*
+X009841Y015540D01*
+X009798Y015515D01*
+X009753Y015493D01*
+X009707Y015474D01*
+X009660Y015460D01*
+X009611Y015449D01*
+X009562Y015442D01*
+X009512Y015439D01*
+X009463Y015440D01*
+X009413Y015445D01*
+X009364Y015454D01*
+X009316Y015467D01*
+X009269Y015483D01*
+X009224Y015503D01*
+X009180Y015527D01*
+X009139Y015554D01*
+X009099Y015584D01*
+X009062Y015618D01*
+X009028Y015654D01*
+X008997Y015693D01*
+X008969Y015734D01*
+X008945Y015777D01*
+X008924Y015822D01*
+X008906Y015869D01*
+X008893Y015916D01*
+X008883Y015965D01*
+X008877Y016014D01*
+X008875Y016064D01*
+D11*
+X009505Y011883D03*
+D12*
+X008730Y011883D03*
+X008730Y012080D03*
+X008730Y012277D03*
+X008730Y011686D03*
+X008730Y011489D03*
+X010281Y011489D03*
+X010281Y011686D03*
+X010281Y011883D03*
+X010281Y012080D03*
+X010281Y012277D03*
+D13*
+X009899Y012658D03*
+X009702Y012658D03*
+X009505Y012658D03*
+X009308Y012658D03*
+X009112Y012658D03*
+X009112Y011107D03*
+X009308Y011107D03*
+X009505Y011107D03*
+X009702Y011107D03*
+X009899Y011107D03*
+D14*
+X010043Y010708D03*
+X009686Y010703D03*
+X009767Y010267D03*
+X009750Y009778D03*
+X009553Y009320D03*
+X009176Y009339D03*
+X009238Y009778D03*
+X009255Y010267D03*
+X009174Y010703D03*
+X008758Y010675D03*
+X008246Y010675D03*
+X008259Y011243D03*
+X007747Y011243D03*
+X007765Y012202D03*
+X008276Y012202D03*
+X010555Y010708D03*
+X010773Y011101D03*
+X010776Y011563D03*
+X010793Y012008D03*
+X011305Y012008D03*
+X011288Y011563D03*
+X011285Y011101D03*
+X011531Y010000D03*
+X011019Y010000D03*
+X010065Y009320D03*
+X009722Y008870D03*
+X009210Y008870D03*
+X008786Y008873D03*
+X008274Y008873D03*
+X008664Y009339D03*
+X010820Y012576D03*
+X011332Y012576D03*
+X011402Y015076D03*
+X010890Y015076D03*
+X008156Y015250D03*
+X007644Y015250D03*
+D15*
+X008280Y010253D03*
+X008823Y010282D03*
+X008823Y009770D03*
+X008280Y009742D03*
+D16*
+X008216Y012922D03*
+X007681Y012922D03*
+X007681Y014115D03*
+X008216Y014115D03*
+D17*
+X009145Y008118D03*
+X009716Y008123D03*
+X010285Y008118D03*
+D18*
+X011211Y008694D03*
+X010837Y009521D03*
+X011585Y009521D03*
+D19*
+X010089Y013432D02*
+X010089Y013590D01*
+X009892Y013590D02*
+X009892Y013432D01*
+X009695Y013432D02*
+X009695Y013590D01*
+X009498Y013590D02*
+X009498Y013432D01*
+X009302Y013432D02*
+X009302Y013590D01*
+X009105Y013590D02*
+X009105Y013432D01*
+X008908Y013432D02*
+X008908Y013590D01*
+X008750Y013747D02*
+X008593Y013747D01*
+X008593Y013944D02*
+X008750Y013944D01*
+X008750Y014141D02*
+X008593Y014141D01*
+X008593Y014338D02*
+X008750Y014338D01*
+X008750Y014535D02*
+X008593Y014535D01*
+X008593Y014732D02*
+X008750Y014732D01*
+X008750Y014928D02*
+X008593Y014928D01*
+X008908Y015086D02*
+X008908Y015243D01*
+X009105Y015243D02*
+X009105Y015086D01*
+X009302Y015086D02*
+X009302Y015243D01*
+X009498Y015243D02*
+X009498Y015086D01*
+X009695Y015086D02*
+X009695Y015243D01*
+X009892Y015243D02*
+X009892Y015086D01*
+X010089Y015086D02*
+X010089Y015243D01*
+X010246Y014928D02*
+X010404Y014928D01*
+X010404Y014732D02*
+X010246Y014732D01*
+X010246Y014535D02*
+X010404Y014535D01*
+X010404Y014338D02*
+X010246Y014338D01*
+X010246Y014141D02*
+X010404Y014141D01*
+X010404Y013944D02*
+X010246Y013944D01*
+X010246Y013747D02*
+X010404Y013747D01*
+M02*