diff --git a/mag/VCO.mag b/mag/VCO.mag
index b22c481..652b6df 100644
--- a/mag/VCO.mag
+++ b/mag/VCO.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1662952744
+timestamp 1663024430
 << locali >>
 rect 33895 33140 34005 33155
 rect 33895 33085 33910 33140
@@ -204,7 +204,7 @@
 rect 36055 25030 36145 25335
 rect 32940 24380 33300 24465
 << metal2 >>
-rect 54790 37160 63380 37200
+rect 54790 37160 63285 37200
 rect 54790 36800 54810 37160
 rect 47700 36700 47790 36710
 rect 47700 36510 47710 36700
@@ -214,8 +214,8 @@
 rect 48170 36510 48180 36700
 rect 48250 36510 48260 36700
 rect 54785 36620 54810 36800
-rect 55190 36620 63380 37160
-rect 54785 36600 63380 36620
+rect 55190 36620 63285 37160
+rect 54785 36600 63285 36620
 rect 48170 36500 48260 36510
 rect 55046 36460 55170 36462
 rect 34240 36435 45110 36460
@@ -225,11 +225,12 @@
 rect 34515 36045 45110 36060
 rect 34240 36020 45110 36045
 rect 53625 35650 53690 36025
-rect 56340 36130 57080 36600
-rect 58440 36160 59180 36600
+rect 56445 36130 56915 36600
+rect 58545 36160 59040 36600
 rect 58725 36145 58940 36160
-rect 60540 36070 61280 36600
-rect 62640 36090 63380 36600
+rect 60650 36070 61180 36600
+rect 62740 36095 63285 36600
+rect 62640 36090 63285 36095
 rect 54350 35650 54895 36025
 rect 53625 35585 54895 35650
 rect 33900 33140 34000 33145
@@ -286,9 +287,9 @@
 rect 53600 21990 54895 22045
 rect 53600 21605 53680 21990
 rect 54610 21605 54895 21990
-rect 56340 21035 57080 21530
-rect 58440 21035 59180 21550
-rect 60540 21035 61280 21540
+rect 56480 21035 56980 21530
+rect 58550 21035 59100 21550
+rect 60630 21035 61195 21540
 rect 62895 21440 63110 21475
 rect 62640 21035 63380 21440
 rect 54785 21030 63380 21035
@@ -630,35 +631,35 @@
 transform 1 0 26070 0 1 10600
 box 10225 10400 29180 26030
 use cap_bank  X4
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 52305 0 -1 34725
 box 3300 -1540 5112 5514
 use cap_bank  X5
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 54405 0 -1 34725
 box 3300 -1540 5112 5514
 use cap_bank  X6
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 52305 0 1 22905
 box 3300 -1540 5112 5514
 use cap_bank  X7
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 54405 0 1 22905
 box 3300 -1540 5112 5514
 use cap_bank  X8
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 56505 0 1 22905
 box 3300 -1540 5112 5514
 use cap_bank  X9
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 58605 0 1 22905
 box 3300 -1540 5112 5514
 use cap_bank  X10
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 56505 0 -1 34725
 box 3300 -1540 5112 5514
 use cap_bank  X11
-timestamp 1662952744
+timestamp 1663024430
 transform 1 0 58605 0 -1 34725
 box 3300 -1540 5112 5514
 use bias_calc  bias_calc_0
@@ -676,11 +677,10 @@
 << labels >>
 rlabel metal5 53630 21190 54080 36450 1 VDD
 rlabel metal5 36330 24100 37030 32510 1 GND
-rlabel metal2 60540 36070 61280 37200 1 GND
-port 1 n
 rlabel metal1 64850 21365 64910 36265 1 CTRL1
 rlabel metal1 64595 21725 64655 35905 1 CTRL2
 rlabel metal1 64345 22265 64405 35365 1 CTRL3
 rlabel metal1 64080 22855 64140 34775 1 CTRL4
 rlabel metal1 63845 23765 63905 33865 1 CTRL5
+rlabel metal2 60650 36070 61180 37200 1 GND
 << end >>
diff --git a/mag/cap_bank.mag b/mag/cap_bank.mag
index a35cfac..78fdc1a 100644
--- a/mag/cap_bank.mag
+++ b/mag/cap_bank.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1662952744
+timestamp 1663024430
 << locali >>
 rect 4525 -40 4560 105
 rect 5040 -40 5075 105
@@ -260,8 +260,14 @@
 rect 4950 -1480 5050 -1180
 << metal4 >>
 rect 4370 2260 4890 2540
+rect 3995 1330 4670 1490
+rect 4055 400 4370 1000
 rect 3730 -1180 4090 -500
-rect 4510 -630 4670 1930
+rect 3730 -1470 3760 -1180
+rect 3880 -1470 4090 -1180
+rect 3730 -1510 4090 -1470
+rect 4210 -1150 4370 400
+rect 4510 -630 4670 1330
 rect 4730 0 4890 2260
 rect 4950 910 5110 4368
 rect 4950 90 4980 910
@@ -276,34 +282,23 @@
 rect 5080 -1030 5110 -650
 rect 4510 -1060 5110 -1030
 rect 4510 -1070 5080 -1060
-rect 3730 -1470 3760 -1180
-rect 3880 -1470 4090 -1180
-rect 3730 -1510 4090 -1470
-rect 4760 -1180 5080 -1150
-rect 4760 -1480 4810 -1180
+rect 4210 -1180 5080 -1150
+rect 4210 -1480 4950 -1180
 rect 5050 -1480 5080 -1180
-rect 4760 -1510 5080 -1480
-<< via4 >>
-rect 4810 -1480 4950 -1180
-rect 4950 -1480 5050 -1180
+rect 4210 -1510 5080 -1480
 << metal5 >>
 rect 3380 3710 4990 4830
 rect 3380 3700 4930 3710
 rect 3380 1430 3970 3700
 rect 3380 -420 3780 1430
-rect 4280 400 5080 1000
-rect 4760 -1180 5080 400
-rect 4760 -1480 4810 -1180
-rect 5050 -1480 5080 -1180
-rect 4760 -1510 5080 -1480
 use sky130_fd_pr__cap_mim_m3_2_WCTBV5  XC1
-timestamp 1660521579
+timestamp 1663024430
 transform 1 0 3851 0 1 701
-box -551 -301 573 301
+box -551 -300 250 300
 use sky130_fd_pr__cap_mim_m3_2_WCTZRP  XC2
-timestamp 1660420676
+timestamp 1663024430
 transform 1 0 3951 0 1 1631
-box -651 -301 673 301
+box -651 -300 340 300
 use sky130_fd_pr__cap_mim_m3_2_3ZFDVT  XC3
 timestamp 1660420676
 transform 1 0 3951 0 1 2761
@@ -313,9 +308,9 @@
 transform 0 1 4611 1 0 4541
 box -951 -501 973 501
 use sky130_fd_pr__cap_mim_m3_2_FJFAMD  XC6
-timestamp 1660420676
+timestamp 1663024107
 transform 1 0 3851 0 1 -229
-box -551 -301 573 301
+box -551 -300 250 300
 use sky130_fd_pr__nfet_01v8_lvt_648S5X  XM1
 timestamp 1662671450
 transform 0 1 4010 -1 0 -1329
diff --git a/mag/sky130_fd_pr__cap_mim_m3_2_FJFAMD.mag b/mag/sky130_fd_pr__cap_mim_m3_2_FJFAMD.mag
index f3d23c7..30f0bbc 100644
--- a/mag/sky130_fd_pr__cap_mim_m3_2_FJFAMD.mag
+++ b/mag/sky130_fd_pr__cap_mim_m3_2_FJFAMD.mag
@@ -1,18 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1660420676
+timestamp 1663024107
 << error_p >>
 rect -435 160 -67 184
 rect -435 -160 -411 160
 rect -435 -184 -67 -160
 << metal4 >>
-rect -551 259 551 300
-rect -551 -259 295 259
-rect 531 -259 551 259
-rect -551 -300 551 -259
-<< via4 >>
-rect 295 -259 531 259
+rect -551 -300 250 300
 << mimcap2 >>
 rect -451 160 -51 200
 rect -451 -160 -411 160
@@ -21,14 +16,10 @@
 << mimcap2contact >>
 rect -411 -160 -91 160
 << metal5 >>
-rect 253 259 573 301
 rect -435 160 -67 184
 rect -435 -160 -411 160
 rect -91 -160 -67 160
 rect -435 -184 -67 -160
-rect 253 -259 295 259
-rect 531 -259 573 259
-rect 253 -301 573 -259
 << properties >>
 string FIXED_BBOX -551 -300 49 300
 string gencell sky130_fd_pr__cap_mim_m3_2
diff --git a/mag/sky130_fd_pr__cap_mim_m3_2_WCTBV5.mag b/mag/sky130_fd_pr__cap_mim_m3_2_WCTBV5.mag
index 286af88..37ef5bb 100644
--- a/mag/sky130_fd_pr__cap_mim_m3_2_WCTBV5.mag
+++ b/mag/sky130_fd_pr__cap_mim_m3_2_WCTBV5.mag
@@ -1,18 +1,13 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1660521579
+timestamp 1663024430
 << error_p >>
 rect -435 160 -67 184
 rect -435 -160 -411 160
 rect -435 -184 -67 -160
 << metal4 >>
-rect -551 259 551 300
-rect -551 -259 295 259
-rect 531 -259 551 259
-rect -551 -300 551 -259
-<< via4 >>
-rect 295 -259 531 259
+rect -551 -300 250 300
 << mimcap2 >>
 rect -451 160 -51 200
 rect -451 -160 -411 160
@@ -21,14 +16,10 @@
 << mimcap2contact >>
 rect -411 -160 -91 160
 << metal5 >>
-rect 253 259 573 301
 rect -435 160 -67 184
 rect -435 -160 -411 160
 rect -91 -160 -67 160
 rect -435 -184 -67 -160
-rect 253 -259 295 259
-rect 531 -259 573 259
-rect 253 -301 573 -259
 << properties >>
 string FIXED_BBOX -551 -300 49 300
 string gencell sky130_fd_pr__cap_mim_m3_2
diff --git a/mag/sky130_fd_pr__cap_mim_m3_2_WCTZRP.mag b/mag/sky130_fd_pr__cap_mim_m3_2_WCTZRP.mag
index 7f6f46e..f8e2513 100644
--- a/mag/sky130_fd_pr__cap_mim_m3_2_WCTZRP.mag
+++ b/mag/sky130_fd_pr__cap_mim_m3_2_WCTZRP.mag
@@ -1,14 +1,9 @@
 magic
 tech sky130A
 magscale 1 2
-timestamp 1660420676
+timestamp 1663024430
 << metal4 >>
-rect -651 259 651 300
-rect -651 -259 395 259
-rect 631 -259 651 259
-rect -651 -300 651 -259
-<< via4 >>
-rect 395 -259 631 259
+rect -651 -300 340 300
 << mimcap2 >>
 rect -551 160 49 200
 rect -551 -160 -511 160
@@ -17,14 +12,10 @@
 << mimcap2contact >>
 rect -511 -160 9 160
 << metal5 >>
-rect 353 259 673 301
 rect -535 160 33 184
 rect -535 -160 -511 160
 rect 9 -160 33 160
 rect -535 -184 33 -160
-rect 353 -259 395 259
-rect 631 -259 673 259
-rect 353 -301 673 -259
 << properties >>
 string FIXED_BBOX -651 -300 149 300
 string gencell sky130_fd_pr__cap_mim_m3_2