diff --git a/gds/user_analog_project_wrapper.gds b/gds/user_analog_project_wrapper.gds
index 6bf343d..af52079 100644
--- a/gds/user_analog_project_wrapper.gds
+++ b/gds/user_analog_project_wrapper.gds
Binary files differ
diff --git a/mag/SSTL/SSTL.mag b/mag/SSTL/SSTL.mag
index 98c59d5..560399e 100644
--- a/mag/SSTL/SSTL.mag
+++ b/mag/SSTL/SSTL.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646792692
+timestamp 1646843053
 << checkpaint >>
 rect -6264 -22040 10600 8224
 rect -6264 -22715 8142 -22040
@@ -1994,61 +1994,61 @@
 rect 6417 -18621 6446 -18043
 rect 2151 -19196 6446 -18621
 use n-leg  n-leg_0
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 436
 box 1854 -48 6546 1136
 use n-leg  n-leg_1
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -2828
 box 1854 -48 6546 1136
 use n-leg  n-leg_2
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -6092
 box 1854 -48 6546 1136
 use n-leg  n-leg_3
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -9356
 box 1854 -48 6546 1136
 use n-leg  n-leg_4
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -12620
 box 1854 -48 6546 1136
 use n-leg  n-leg_5
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -15884
 box 1854 -48 6546 1136
 use n-leg  n-leg_6
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -284 0 1 -19148
 box 1854 -48 6546 1136
 use p-leg  p-leg_0
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 1514
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_1
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -1750
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_2
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -5014
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_3
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -8278
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_4
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -11542
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_5
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -14806
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use p-leg  p-leg_6
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2 0 1 -18070
-box -34 -38 6666 2234
+box -50 -38 6666 2234
 use sky130_fd_sc_hd__clkbuf_8  sky130_fd_sc_hd__clkbuf_8_0 
 timestamp 1643856600
 transform 1 0 558 0 1 436
@@ -2162,87 +2162,87 @@
 transform 1 0 -730 0 1 -19148
 box -38 -48 682 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_0 
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 1524
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_1
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 2612
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_2
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 2612
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_3
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -1740
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_4
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -652
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_5
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -652
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_6
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -5004
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_7
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -3916
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_8
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -3916
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_9
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -8268
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_10
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -7180
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_11
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -7180
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_12
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -11532
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_13
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -10444
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_14
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -10444
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_15
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -14796
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_16
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -13708
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_17
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -13708
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_18
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -18060
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_19
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 -1 -16972
 box -38 -48 2246 592
 use sky130_fd_sc_hd__clkinv_16  sky130_fd_sc_hd__clkinv_16_20
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 -2294 0 1 -16972
 box -38 -48 2246 592
 use sky130_fd_sc_hd__fill_1  sky130_fd_sc_hd__fill_1_0 
diff --git a/mag/SSTL/n-leg.mag b/mag/SSTL/n-leg.mag
index 9a7f667..33ef784 100644
--- a/mag/SSTL/n-leg.mag
+++ b/mag/SSTL/n-leg.mag
@@ -1,14 +1,14 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646792692
+timestamp 1646843053
 << checkpaint >>
 rect 76 -3567 8426 4363
 << pwell >>
 rect 1883 1071 1917 1105
 rect 3355 1071 3389 1105
 rect 4827 1071 4861 1105
-rect 1868 21 3314 203
+rect 1854 21 3314 203
 rect 3340 21 4786 203
 rect 4812 21 6258 203
 rect 1883 -17 1917 21
@@ -66,13 +66,13 @@
 << ndiff >>
 rect 6325 808 6361 812
 rect 6325 782 6331 808
-rect 1894 161 1946 177
-rect 1894 127 1902 161
+rect 1864 161 1946 177
+rect 1864 127 1902 161
 rect 1936 127 1946 161
-rect 1894 93 1946 127
-rect 1894 59 1902 93
+rect 1864 93 1946 127
+rect 1864 59 1902 93
 rect 1936 59 1946 93
-rect 1894 47 1946 59
+rect 1864 47 1946 59
 rect 1976 161 2030 177
 rect 1976 127 1986 161
 rect 2020 127 2030 161
@@ -452,8 +452,8 @@
 rect 6286 45 6519 156
 << poly >>
 rect 1854 249 6270 265
-rect 1854 215 1896 249
-rect 1930 215 2070 249
+rect 1854 215 1950 249
+rect 1984 215 2070 249
 rect 2104 215 2238 249
 rect 2272 215 2407 249
 rect 2441 215 2574 249
@@ -578,7 +578,7 @@
 rect 6066 21 6096 47
 rect 6150 21 6180 47
 << polycont >>
-rect 1896 215 1930 249
+rect 1950 215 1984 249
 rect 2070 215 2104 249
 rect 2238 215 2272 249
 rect 2407 215 2441 249
@@ -725,8 +725,8 @@
 rect 6425 527 6483 561
 rect 6517 527 6546 561
 rect 1854 249 6270 263
-rect 1854 215 1896 249
-rect 1930 215 2070 249
+rect 1854 215 1950 249
+rect 1984 215 2070 249
 rect 2104 215 2238 249
 rect 2272 215 2407 249
 rect 2441 215 2574 249
@@ -1544,19 +1544,19 @@
 rect 4490 360 4522 412
 rect 4426 349 4522 360
 use n-leg_ctrl_fet_0  n-leg_ctrl_fet_0_0
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 1991 0 -1 869
 box -129 -153 2945 91
 use n-leg_ctrl_fet_1  n-leg_ctrl_fet_1_0
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 5164 0 -1 795
 box -129 -153 689 91
 use n-leg_ctrl_fet_2  n-leg_ctrl_fet_2_0
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 6104 0 1 847
 box -129 -153 221 91
 use n-leg_ctrl_fet_3  n-leg_ctrl_fet_3_0
-timestamp 1646792692
+timestamp 1646843053
 transform 1 0 6404 0 1 727
 box -73 -107 73 107
 use n-leg_polyres  n-leg_polyres_0
@@ -1568,8 +1568,6 @@
 port 7 w
 flabel metal1 1900 651 1900 651 7 FreeSerif 320 0 0 0 cal_ctrl[3]
 port 8 w
-flabel polycont 1913 232 1913 232 7 FreeSerif 320 0 0 0 pd_ctrl
-port 1 w
 flabel viali 1900 -1 1900 -1 7 FreeSerif 320 0 0 0 GND
 port 2 w
 flabel viali 1900 1089 1900 1089 7 FreeSerif 320 0 0 0 GND
@@ -1580,4 +1578,6 @@
 port 3 w
 flabel metal1 s 1900 909 1900 909 7 FreeSerif 320 0 0 0 cal_ctrl[1]
 port 6 w
+flabel polycont 1967 232 1967 232 7 FreeSerif 320 0 0 0 pd_ctrl
+port 1 w
 << end >>
diff --git a/mag/SSTL/n-leg_ctrl_fet_0.mag b/mag/SSTL/n-leg_ctrl_fet_0.mag
index 9b901d7..fccccd8 100644
--- a/mag/SSTL/n-leg_ctrl_fet_0.mag
+++ b/mag/SSTL/n-leg_ctrl_fet_0.mag
@@ -1,7 +1,41 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1642450972
+timestamp 1646843053
+<< error_p >>
+rect -125 -65 -63 65
+rect -33 -65 33 65
+rect 63 -65 125 65
+rect 155 -65 221 65
+rect 251 -65 313 65
+rect 343 -65 409 65
+rect 439 -65 501 65
+rect 531 -65 597 65
+rect 627 -65 689 65
+rect 719 -65 785 65
+rect 815 -65 877 65
+rect 907 -65 973 65
+rect 1003 -65 1065 65
+rect 1095 -65 1161 65
+rect 1191 -65 1253 65
+rect 1283 -65 1349 65
+rect 1379 -65 1441 65
+rect 1471 -65 1537 65
+rect 1567 -65 1629 65
+rect 1659 -65 1725 65
+rect 1755 -65 1817 65
+rect 1847 -65 1913 65
+rect 1943 -65 2005 65
+rect 2035 -65 2101 65
+rect 2131 -65 2193 65
+rect 2223 -65 2289 65
+rect 2319 -65 2381 65
+rect 2411 -65 2477 65
+rect 2507 -65 2569 65
+rect 2599 -65 2665 65
+rect 2695 -65 2757 65
+rect 2787 -65 2853 65
+rect 2883 -65 2945 65
 << nmos >>
 rect -63 -65 -33 65
 rect 33 -65 63 65
@@ -406,6 +440,6 @@
 rect 2885 -137 2901 -103
 << properties >>
 string gencell sky130_fd_pr__nfet_01v8
-string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/SSTL/n-leg_ctrl_fet_1.mag b/mag/SSTL/n-leg_ctrl_fet_1.mag
index 72c2b28..8905d19 100644
--- a/mag/SSTL/n-leg_ctrl_fet_1.mag
+++ b/mag/SSTL/n-leg_ctrl_fet_1.mag
@@ -1,7 +1,17 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1642732258
+timestamp 1646843053
+<< error_p >>
+rect -125 -65 -63 65
+rect -33 -65 33 65
+rect 63 -65 125 65
+rect 155 -65 221 65
+rect 251 -65 313 65
+rect 343 -65 409 65
+rect 439 -65 501 65
+rect 531 -65 597 65
+rect 627 -65 689 65
 << nmos >>
 rect -63 -65 -33 65
 rect 33 -65 63 65
@@ -118,6 +128,6 @@
 rect 629 -137 689 -103
 << properties >>
 string gencell sky130_fd_pr__nfet_01v8
-string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/SSTL/n-leg_ctrl_fet_2.mag b/mag/SSTL/n-leg_ctrl_fet_2.mag
index c68c264..41d8cc1 100644
--- a/mag/SSTL/n-leg_ctrl_fet_2.mag
+++ b/mag/SSTL/n-leg_ctrl_fet_2.mag
@@ -1,7 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1642733691
+timestamp 1646843053
+<< error_p >>
+rect -125 -65 -63 65
+rect -33 -65 33 65
+rect 63 -65 125 65
+rect 155 -65 221 65
 << nmos >>
 rect -63 -65 -33 65
 rect 33 -65 63 65
@@ -58,6 +63,6 @@
 rect 157 -137 173 -103
 << properties >>
 string gencell sky130_fd_pr__nfet_01v8
-string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 0.650 l 0.150 m 1 nf 2 diffcov 25 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 0 poverlap 1 doverlap 1 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 0 viadrn 0 viagate 0 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/SSTL/n-leg_ctrl_fet_3.mag b/mag/SSTL/n-leg_ctrl_fet_3.mag
index 118105f..a78d354 100644
--- a/mag/SSTL/n-leg_ctrl_fet_3.mag
+++ b/mag/SSTL/n-leg_ctrl_fet_3.mag
@@ -1,7 +1,10 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1642734083
+timestamp 1646843053
+<< error_p >>
+rect -73 -19 -15 81
+rect 15 -19 73 81
 << nmos >>
 rect -15 -19 15 81
 << ndiff >>
@@ -34,6 +37,6 @@
 rect 17 -91 33 -57
 << properties >>
 string gencell sky130_fd_pr__nfet_01v8
-string parameters w 0.5 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 0 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 0.5 l 0.150 m 1 nf 1 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 0 lmin 0.15 wmin 0.42 compatible {sky130_fd_pr__nfet_01v8 sky130_fd_pr__nfet_01v8_lvt  sky130_fd_bs_flash__special_sonosfet_star  sky130_fd_pr__nfet_g5v0d10v5 sky130_fd_pr__nfet_05v0_nvt  sky130_fd_pr__nfet_03v3_nvt} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/SSTL/p-leg.mag b/mag/SSTL/p-leg.mag
index cb3097b..9dafaf8 100644
--- a/mag/SSTL/p-leg.mag
+++ b/mag/SSTL/p-leg.mag
@@ -1,16 +1,11 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646792189
-<< checkpaint >>
-rect -3964 5581 10174 5999
-rect -3964 5384 10253 5581
-rect -3964 4862 10445 5384
-rect -3966 -2481 10445 4862
-rect -3966 -2642 10253 -2481
-rect -3966 -3746 10172 -2642
+timestamp 1646843053
 << nwell >>
-rect -34 1604 6666 1925
+rect -50 1925 -14 2067
+rect -50 1604 6666 1925
+rect -50 1217 -14 1604
 << pwell >>
 rect 30 2162 74 2196
 rect 766 2162 810 2196
@@ -21,6 +16,8 @@
 rect 4446 2162 4490 2196
 rect 5182 2162 5226 2196
 rect 5918 2162 5962 2196
+<< pdiff >>
+rect -14 1805 4 2005
 << nsubdiff >>
 rect 6289 1857 6323 1881
 rect 6289 1773 6323 1823
@@ -574,143 +571,143 @@
 rect 3260 273 3330 283
 rect 76 183 242 193
 use p-leg_6  p-leg_6_0
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 1058 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_1
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 1826 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_2
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 2594 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_3
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 3362 0 -1 1415
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_4
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 4852 0 -1 1341
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_5
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 5620 0 -1 1341
 box -1089 -161 -191 198
 use p-leg_6  p-leg_6_6
-timestamp 1643158822
+timestamp 1646843053
 transform 1 0 6512 0 1 1451
 box -1089 -161 -191 198
 use p-leg_fet_16  p-leg_fet_16_0
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 1055 0 1 347
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_1
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 3103 0 1 347
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_2
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 5151 0 1 347
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_3
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 1055 0 -1 769
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_4
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 3103 0 -1 769
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_5
-timestamp 1643664681
+timestamp 1646843053
 transform 1 0 5151 0 -1 769
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_6
-timestamp 1643664681
+timestamp 1646843053
 transform -1 0 3105 0 1 1869
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_7
-timestamp 1643664681
+timestamp 1646843053
 transform -1 0 5153 0 1 1869
 box -1089 -161 1089 198
 use p-leg_fet_16  p-leg_fet_16_8
-timestamp 1643664681
+timestamp 1646843053
 transform -1 0 1057 0 1 1869
 box -1089 -161 1089 198
 use p-leg_polyres  p-leg_polyres_0
-timestamp 1646792189
+timestamp 1646843053
 transform 0 -1 3515 1 0 1197
 box -33 -253 33 253
-use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0 
-timestamp 1646792189
+use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_0
+timestamp 1646843053
 transform 1 0 4 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_1
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 740 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_2
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 1476 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_3
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2212 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_4
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2948 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_5
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 3684 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_6
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 4420 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_7
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 5156 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_8
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 5892 0 1 10
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_9
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 4 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_10
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 740 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_11
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 1476 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_12
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2212 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_13
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 2948 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_14
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 3684 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_15
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 4420 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_16
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 5156 0 1 1098
 box -38 -48 774 592
 use sky130_fd_sc_hd__fill_8  sky130_fd_sc_hd__fill_8_17
-timestamp 1646792189
+timestamp 1646843053
 transform 1 0 5892 0 1 1098
 box -38 -48 774 592
 << labels >>
diff --git a/mag/SSTL/p-leg_6.mag b/mag/SSTL/p-leg_6.mag
index e8c282c..d8fa5da 100644
--- a/mag/SSTL/p-leg_6.mag
+++ b/mag/SSTL/p-leg_6.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1643158822
+timestamp 1646843053
+<< error_p >>
+rect -1089 -100 -191 198
 << nwell >>
 rect -1089 -100 -191 198
 << pmoslvt >>
@@ -103,6 +105,6 @@
 rect -301 -145 -285 -111
 << properties >>
 string gencell sky130_fd_pr__pfet_01v8_lvt
-string parameters w 1.0 l 0.35 m 1 nf 16 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.35 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 1.0 l 0.35 m 1 nf 16 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.35 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/SSTL/p-leg_fet_16.mag b/mag/SSTL/p-leg_fet_16.mag
index 243c895..c41965e 100644
--- a/mag/SSTL/p-leg_fet_16.mag
+++ b/mag/SSTL/p-leg_fet_16.mag
@@ -1,7 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1643664681
+timestamp 1646843053
+<< error_p >>
+rect -1089 -100 1089 198
 << nwell >>
 rect -1089 -100 1089 198
 << pmoslvt >>
@@ -233,6 +235,6 @@
 rect 979 -145 1053 -111
 << properties >>
 string gencell sky130_fd_pr__pfet_01v8_lvt
-string parameters w 1.0 l 0.35 m 1 nf 16 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.35 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 string library sky130
+string parameters w 1.0 l 0.35 m 1 nf 16 diffcov 100 polycov 100 guard 0 glc 0 grc 0 gtc 0 gbc 0 tbcov 100 rlcov 100 topc 0 botc 1 poverlap 0 doverlap 1 lmin 0.35 wmin 0.42 compatible {sky130_fd_pr__pfet_01v8  sky130_fd_pr__pfet_01v8_lvt sky130_fd_pr__pfet_01v8_hvt  sky130_fd_pr__pfet_g5v0d10v5} full_metal 0 viasrc 100 viadrn 100 viagate 100 viagb 0 viagr 0 viagl 0 viagt 0
 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index b330842..cc3cdf3 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,12 +1,12 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1646803868
+timestamp 1646843293
 << checkpaint >>
-rect 11573 647465 53167 689591
-rect 3138 647230 58204 647465
-rect 3068 638726 58296 647230
-rect 3138 638579 58204 638726
+rect 14245 644793 50495 686919
+rect 5810 644558 55532 644793
+rect 5740 641398 55624 644558
+rect 5810 641251 55532 641398
 << metal1 >>
 rect 7241 643202 7251 643298
 rect 7469 643202 7479 643298