C4 DRC solving

diff --git a/mag/C4.mag b/mag/C4.mag
index fa46a5a..ca7793d 100644
--- a/mag/C4.mag
+++ b/mag/C4.mag

@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1654632083
+timestamp 1654638763
 << nwell >>
 rect 8 166 210 596
 << nmos >>
@@ -125,12 +125,12 @@
 rect -71 329 -33 388
 rect 61 329 77 388
 rect 138 329 154 388
-rect -325 234 -255 247
+rect -323 234 -253 247
 rect -209 234 -168 329
 rect 200 318 234 334
-rect -325 231 -168 234
-rect -325 197 -309 231
-rect -273 197 -168 231
+rect -323 231 -168 234
+rect -323 197 -307 231
+rect -271 197 -168 231
 rect -134 262 -67 277
 rect -134 228 -119 262
 rect -84 228 -67 262
@@ -138,8 +138,8 @@
 rect 61 214 77 273
 rect 138 214 154 273
 rect 200 268 234 284
-rect -325 193 -168 197
-rect -325 180 -255 193
+rect -323 193 -168 197
+rect -323 180 -253 193
 rect -209 177 -168 193
 rect -209 161 -60 177
 rect -209 127 -108 161
@@ -181,7 +181,7 @@
 rect -308 398 -274 432
 rect -274 398 -273 432
 rect -309 397 -273 398
-rect -309 197 -273 231
+rect -307 197 -271 231
 rect -119 228 -118 262
 rect -118 228 -84 262
 rect 226 101 262 137
@@ -203,15 +203,15 @@
 rect 77 490 91 524
 rect 125 490 138 524
 rect 77 478 138 490
-rect -325 433 51 448
-rect -325 397 -309 433
+rect -324 433 51 448
+rect -324 397 -309 433
 rect -273 397 51 433
-rect -325 382 51 397
+rect -324 382 51 397
 rect -135 262 -67 277
-rect -325 242 -255 247
-rect -325 187 -318 242
-rect -261 187 -255 242
-rect -325 180 -255 187
+rect -323 242 -253 247
+rect -323 187 -316 242
+rect -259 187 -253 242
+rect -323 180 -253 187
 rect -135 228 -119 262
 rect -84 228 -67 262
 rect -260 6 -200 18
@@ -240,11 +240,11 @@
 rect -178 -253 315 -244
 << via1 >>
 rect -192 594 -124 662
-rect -318 231 -261 242
-rect -318 197 -309 231
-rect -309 197 -273 231
-rect -273 197 -261 231
-rect -318 187 -261 197
+rect -316 231 -259 242
+rect -316 197 -307 231
+rect -307 197 -271 231
+rect -271 197 -259 231
+rect -316 187 -259 197
 rect 231 137 291 150
 rect 231 101 262 137
 rect 262 101 291 137
@@ -252,75 +252,77 @@
 rect 238 -244 306 -164
 << metal2 >>
 rect -202 662 -114 672
+rect -1956 650 -1878 659
+rect -1956 594 -1945 650
+rect -1888 594 -1878 650
+rect -1956 584 -1878 594
 rect -202 594 -192 662
 rect -124 594 -114 662
 rect -202 584 -114 594
 rect 1174 286 1272 295
-rect -329 242 -251 251
-rect -329 185 -320 242
-rect -260 185 -251 242
+rect -330 242 -249 251
+rect -330 185 -318 242
+rect -258 185 -249 242
 rect 1174 206 1183 286
 rect 1263 206 1272 286
 rect 1174 197 1272 206
-rect -329 176 -251 185
+rect -330 176 -249 185
 rect 222 150 300 159
-rect -2031 87 -1953 96
-rect -2031 31 -2020 87
-rect -1963 31 -1953 87
 rect 222 90 231 150
 rect 291 90 300 150
 rect 222 81 300 90
-rect -2031 21 -1953 31
 rect 229 -164 315 -155
 rect 229 -244 238 -164
 rect 306 -244 315 -164
 rect 229 -253 315 -244
 << via2 >>
+rect -1945 594 -1888 650
 rect -192 594 -124 662
-rect -320 187 -318 242
-rect -318 187 -261 242
-rect -261 187 -260 242
-rect -320 185 -260 187
+rect -318 187 -316 242
+rect -316 187 -259 242
+rect -259 187 -258 242
+rect -318 185 -258 187
 rect 1183 206 1263 286
-rect -2020 31 -1963 87
 rect 231 90 291 150
 rect 238 -244 306 -164
 << metal3 >>
-rect -2028 470 -283 678
+rect -3132 670 -1968 678
+rect -3132 650 -1867 670
+rect -3132 594 -1945 650
+rect -1888 594 -1867 650
+rect -3132 573 -1867 594
+rect -3132 -257 -1968 573
+rect -1532 333 -368 678
 rect -208 662 -108 678
 rect -208 594 -192 662
 rect -124 594 -108 662
 rect -208 578 -108 594
-rect -2028 242 -98 470
-rect -2028 185 -320 242
-rect -260 185 -98 242
-rect -2028 157 -98 185
+rect -1666 313 -368 333
+rect -1666 -60 -1659 313
+rect -1665 -251 -1659 -60
+rect -1571 275 -368 313
+rect -1571 242 -228 275
+rect -1571 185 -318 242
+rect -258 185 -228 242
+rect -1571 152 -228 185
 rect 211 160 311 170
-rect -339 147 -239 157
-rect -494 96 -403 97
-rect -2031 87 -403 96
-rect -2031 31 -2020 87
-rect -1963 31 -403 87
-rect -339 67 -329 147
-rect -249 67 -239 147
+rect -1571 -251 -368 152
 rect 211 80 221 160
 rect 301 80 311 160
 rect 211 70 311 80
-rect -339 57 -239 67
-rect -2031 -256 -403 31
 rect 393 -154 1093 677
 rect 1173 286 1273 296
 rect 1173 206 1183 286
 rect 1263 206 1273 286
 rect 1173 196 1273 206
+rect -1665 -257 -368 -251
 rect 228 -164 1093 -154
 rect 228 -244 238 -164
 rect 306 -244 1093 -164
 rect 228 -254 1093 -244
-rect -2031 -257 -409 -256
 << via3 >>
 rect -192 594 -124 662
-rect -329 67 -249 147
+rect -1659 -251 -1571 313
 rect 221 150 301 160
 rect 221 90 231 150
 rect 231 90 291 150
@@ -328,46 +330,47 @@
 rect 221 80 301 90
 rect 1183 206 1263 286
 << mimcap >>
-rect -2000 627 -412 648
-rect -2000 205 -1979 627
-rect -433 205 -412 627
-rect -2000 185 -412 205
+rect -3104 631 -1996 650
+rect -3104 -210 -3084 631
+rect -2016 -210 -1996 631
+rect -3104 -229 -1996 -210
+rect -1504 631 -396 650
+rect -1504 -210 -1484 631
+rect -416 -210 -396 631
+rect -1504 -229 -396 -210
 rect 422 630 1065 649
-rect -2003 -27 -437 -7
-rect -2003 -209 -1982 -27
-rect -458 -209 -437 -27
-rect -2003 -229 -437 -209
 rect 422 -207 442 630
 rect 1045 -207 1065 630
 rect 422 -226 1065 -207
 << mimcapcontact >>
-rect -1979 205 -433 627
-rect -1982 -209 -458 -27
+rect -3084 -210 -2016 631
+rect -1484 -210 -416 631
 rect 442 -207 1045 630
 << metal4 >>
-rect -211 677 -108 678
-rect -756 662 -108 677
-rect -756 628 -192 662
-rect -1980 627 -192 628
-rect -1980 205 -1979 627
-rect -433 594 -192 627
+rect -817 662 -108 678
+rect -817 650 -192 662
+rect -836 632 -192 650
+rect -3085 631 -2015 632
+rect -3085 -210 -3084 631
+rect -2016 334 -2015 631
+rect -1485 631 -192 632
+rect -2016 313 -1565 334
+rect -2016 -210 -1659 313
+rect -3085 -211 -1659 -210
+rect -2367 -251 -1659 -211
+rect -1571 -251 -1565 313
+rect -1485 -210 -1484 631
+rect -416 594 -192 631
 rect -124 594 -108 662
-rect -433 578 -108 594
+rect -416 578 -108 594
 rect 441 630 1046 631
-rect -433 205 -432 578
-rect -1980 204 -432 205
+rect -416 577 -205 578
+rect -416 -210 -415 577
 rect 441 170 442 630
 rect 211 160 442 170
-rect -339 147 -239 157
-rect -339 67 -329 147
-rect -249 67 -239 147
 rect 211 80 221 160
 rect 301 80 442 160
 rect 211 70 442 80
-rect -1983 -27 -457 -26
-rect -339 -27 -239 67
-rect -1983 -209 -1982 -27
-rect -458 -209 -237 -27
 rect 441 -207 442 70
 rect 1045 296 1046 630
 rect 1045 286 1273 296
@@ -376,18 +379,19 @@
 rect 1045 196 1273 206
 rect 1045 -207 1046 196
 rect 441 -208 1046 -207
-rect -1983 -210 -457 -209
+rect -1485 -211 -415 -210
+rect -2367 -258 -1565 -251
 << labels >>
-flabel poly -263 -45 -197 21 7 FreeSans 400 0 0 0 vtl
-port 5 w
-flabel poly 184 268 250 334 7 FreeSans 400 0 0 0 vth
-port 6 w
-flabel space -178 -254 226 -157 5 FreeSans 400 0 0 0 vss
-port 7 s
-flabel metal1 -23 614 20 662 1 FreeSans 400 0 0 0 vdd
-port 8 n
-flabel metal2 -2031 21 -1953 96 7 FreeSans 400 0 0 0 vin
-port 9 w
 flabel metal2 1174 197 1272 295 3 FreeSans 320 0 0 0 vout
 port 10 e
+flabel metal1 -23 614 20 662 1 FreeSans 400 0 0 0 vdd
+port 8 n
+flabel space -178 -254 226 -157 5 FreeSans 400 0 0 0 vss
+port 7 s
+flabel poly 184 268 250 334 7 FreeSans 400 0 0 0 vth
+port 6 w
+flabel poly -263 -45 -197 21 7 FreeSans 400 0 0 0 vtl
+port 5 w
+flabel metal2 -1956 584 -1878 659 7 FreeSans 400 0 0 0 vin
+port 9 w
 << end >>

diff --git a/xschem/C4.sch b/xschem/C4.sch
index a963a40..a96107c 100644
--- a/xschem/C4.sch
+++ b/xschem/C4.sch

@@ -136,12 +136,12 @@
 C {devices/lab_pin.sym} -120 -450 0 0 {name=l15 sig_type=std_logic lab=vout}
 C {devices/iopin.sym} -120 -380 0 0 {name=p5 lab=vssa}
 C {devices/iopin.sym} -120 -410 0 0 {name=p6 lab=1v8}
-C {sky130_fd_pr/cap_mim_m3_1.sym} 50 -190 1 0 {name=C2 model=cap_mim_m3_1 W=7.83 L=1.11 MF=1 spiceprefix=X}
+C {sky130_fd_pr/cap_mim_m3_1.sym} 50 -190 1 0 {name=C2 model=cap_mim_m3_1 W=5.5 L=4.4 MF=1 spiceprefix=X}
 C {devices/lab_pin.sym} -160 -410 0 0 {name=l1 sig_type=std_logic lab=1v8}
 C {devices/lab_pin.sym} -160 -380 0 0 {name=l2 sig_type=std_logic lab=vssa}
 C {devices/lab_pin.sym} 340 -500 0 0 {name=l3 sig_type=std_logic lab=1v8}
 C {devices/lab_pin.sym} 340 0 0 0 {name=l6 sig_type=std_logic lab=vssa}
 C {devices/lab_pin.sym} 220 -330 0 0 {name=l7 sig_type=std_logic lab=vssa}
-C {sky130_fd_pr/cap_mim_m3_1.sym} 130 -280 0 0 {name=C1 model=cap_mim_m3_1 W=8 L=2.3 MF=1 spiceprefix=X}
+C {sky130_fd_pr/cap_mim_m3_1.sym} 130 -280 0 0 {name=C1 model=cap_mim_m3_1 W=5.5 L=4.4 MF=1 spiceprefix=X}
 C {sky130_fd_pr/cap_mim_m3_1.sym} 570 -300 0 0 {name=C3 model=cap_mim_m3_1 W=3.22 L=4.38 MF=1 spiceprefix=X}
 C {devices/lab_pin.sym} 570 -180 0 0 {name=l4 sig_type=std_logic lab=vssa}