wip-ota+comparator
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index bcd04e5..2f91c69 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,7 +1,7 @@
 magic
 tech sky130B
 magscale 1 2
-timestamp 1647124351
+timestamp 1647352739
 << dnwell >>
 rect 561940 685328 563006 686342
 << pwell >>
@@ -10,6 +10,9 @@
 rect 548026 677495 548438 677529
 rect 543778 677268 543874 677316
 rect 548026 676951 548440 676985
+<< viali >>
+rect 543236 677290 543342 677392
+rect 547956 677070 547990 677412
 << metal1 >>
 rect 561180 686400 561428 686442
 rect 561180 686254 561216 686400
@@ -42,13 +45,25 @@
 rect 224866 683612 226828 683613
 rect 548032 677464 548438 677560
 rect 543766 677426 543886 677436
+rect 543224 677392 543354 677398
+rect 543224 677290 543236 677392
+rect 543342 677290 543354 677392
+rect 543224 677284 543354 677290
 rect 543766 677372 543776 677426
 rect 543876 677372 543886 677426
 rect 543766 677262 543886 677372
-rect 543162 677002 543810 677016
-rect 543162 676932 543168 677002
-rect 543794 676932 543810 677002
-rect 543162 676920 543810 676932
+rect 547950 677412 547996 677424
+rect 543768 677116 543882 677180
+rect 543768 677058 543774 677116
+rect 543876 677058 543882 677116
+rect 547950 677070 547956 677412
+rect 547990 677070 547996 677412
+rect 547950 677058 547996 677070
+rect 543768 677050 543882 677058
+rect 543162 676998 543810 677016
+rect 543162 676934 543172 676998
+rect 543614 676934 543810 676998
+rect 543162 676920 543810 676934
 rect 548029 676920 548440 677016
 << via1 >>
 rect 561216 686254 561378 686400
@@ -56,20 +71,32 @@
 rect 326572 684652 326878 684824
 rect 224872 683618 225178 683790
 rect 554512 677472 555148 677550
+rect 543236 677290 543342 677392
 rect 543776 677372 543876 677426
-rect 543168 676932 543794 677002
+rect 543774 677058 543876 677116
+rect 543172 676934 543614 676998
 << metal2 >>
 rect 512622 703358 513362 703376
+rect 122232 703318 122972 703340
+rect 70224 703258 70964 703280
+rect 70224 702558 70242 703258
+rect 70942 702558 70964 703258
+rect -193 -193 193 700125
+rect 70224 675380 70964 702558
+rect 122232 702618 122252 703318
+rect 122952 702618 122972 703318
+rect 122232 677106 122972 702618
 rect 415430 703206 416162 703216
 rect 415430 702616 415440 703206
 rect 416152 702616 416162 703206
 rect 415430 702606 416162 702616
 rect 467610 703066 468342 703076
-rect -193 -193 193 700125
-rect 172840 699800 173580 699824
-rect 172840 699100 172858 699800
-rect 173558 699100 173580 699800
-rect 172840 699084 173580 699100
+rect 172546 699800 173866 699922
+rect 172546 699100 172858 699800
+rect 173558 699100 173866 699800
+rect 172546 698804 173866 699100
+rect 172546 698100 173872 698804
+rect 172552 683170 173872 698100
 rect 224634 698474 225366 698484
 rect 224634 697884 224644 698474
 rect 225356 697884 225366 698474
@@ -141,6 +168,8 @@
 rect 224862 683618 224872 683790
 rect 225178 683618 225189 683790
 rect 224862 683607 225189 683618
+rect 172526 681850 543886 683170
+rect 543764 677674 543886 681850
 rect 562127 681532 562489 685199
 rect 582202 681532 583046 681536
 rect 562127 681526 583046 681532
@@ -148,29 +177,43 @@
 rect 583036 681176 583046 681526
 rect 562127 681170 583046 681176
 rect 582202 681166 583046 681170
-rect 543766 677426 543886 677696
+rect 543766 677426 543886 677674
 rect 555482 677560 559312 677618
 rect 554504 677550 559312 677560
 rect 554504 677472 554512 677550
 rect 555148 677472 559312 677550
 rect 554504 677464 559312 677472
-rect 543766 677372 543776 677426
-rect 543876 677372 543886 677426
-rect 543766 677364 543886 677372
-rect 555482 677362 559312 677464
+rect 543236 677392 543342 677402
 rect 512642 677336 542642 677338
+rect 122230 676600 122972 677106
 rect 512624 677308 542642 677336
 rect 512624 676608 512642 677308
 rect 513342 677140 542642 677308
+rect 543766 677372 543776 677426
+rect 543876 677372 543886 677426
+rect 543766 677364 543886 677372
+rect 543236 677280 543342 677290
 rect 513342 677016 542784 677140
-rect 513342 677002 543810 677016
-rect 513342 676932 543168 677002
-rect 543794 676932 543810 677002
-rect 513342 676920 543810 676932
+rect 543768 677116 543882 677120
+rect 543768 677058 543774 677116
+rect 543876 677058 543882 677116
+rect 542972 677016 543648 677018
+rect 513342 676998 543648 677016
+rect 513342 676934 543172 676998
+rect 543614 676934 543648 676998
+rect 513342 676920 543648 676934
 rect 513342 676796 542784 676920
+rect 543768 676872 543882 677058
 rect 513342 676608 542642 676796
+rect 122230 676238 122968 676600
 rect 512624 676598 542642 676608
 rect 512624 676582 513360 676598
+rect 543768 676238 543884 676872
+rect 122222 675830 543884 676238
+rect 547944 676848 548002 677426
+rect 555482 677362 559312 677464
+rect 547944 675380 548004 676848
+rect 70206 675074 548012 675380
 rect 558568 642500 559308 677362
 rect 558568 642478 583348 642500
 rect 558568 641778 582624 642478
@@ -672,6 +715,8 @@
 rect 582068 -800 582180 480
 rect 583250 -800 583362 480
 << via2 >>
+rect 70242 702558 70942 703258
+rect 122252 702618 122952 703318
 rect 415440 702616 416152 703206
 rect 172858 699100 173558 699800
 rect 224644 697884 225356 698474
@@ -684,13 +729,20 @@
 rect 512766 686565 513264 686566
 rect 582730 681176 583036 681526
 rect 512642 676608 513342 677308
+rect 543236 677290 543342 677392
 rect 582624 641778 583324 642478
 << metal3 >>
 rect 165596 704800 170590 704804
 rect 175896 704800 180890 704804
 rect 16194 702300 21194 704800
-rect 68194 702300 73194 704800
-rect 120194 702300 125194 704800
+rect 68194 703258 73194 704800
+rect 68194 702558 70242 703258
+rect 70942 702558 73194 703258
+rect 68194 702300 73194 702558
+rect 120194 703318 125194 704800
+rect 120194 702618 122252 703318
+rect 122952 702618 125194 703318
+rect 120194 702300 125194 702618
 rect 165594 702300 170594 704800
 rect 170894 702300 173094 704800
 rect 173394 702300 175594 704800
@@ -757,18 +809,25 @@
 rect 512622 676758 512642 677308
 rect 512624 676608 512642 676758
 rect 513342 676758 513362 677308
+rect 543204 677392 543368 677416
+rect 543204 677290 543236 677392
+rect 543342 677290 543368 677392
 rect 513342 676608 513360 676758
 rect 512624 676582 513360 676608
 rect -800 643842 1660 648642
+rect -800 633842 1660 638642
+rect 543204 587314 543368 677290
 rect 582340 642478 584800 644584
 rect 582340 641778 582624 642478
 rect 583324 641778 584800 642478
 rect 582340 639784 584800 641778
-rect -800 633842 1660 638642
 rect 582340 629784 584800 634584
 rect 583520 589472 584800 589584
 rect 583520 588290 584800 588402
-rect 583520 587108 584800 587220
+rect 543202 587224 543368 587314
+rect 543202 587222 543426 587224
+rect 543202 587220 583530 587222
+rect 543202 587108 584800 587220
 rect 583520 585926 584800 586038
 rect 583520 584744 584800 584856
 rect 583520 583562 584800 583674
@@ -952,7 +1011,7 @@
 transform 1 0 562058 0 1 685450
 box 0 0 864 800
 use sky130_sc_ams__comparator_1  sky130_sc_ams__comparator_1_0
-timestamp 1647118226
+timestamp 1647352739
 transform 1 0 543156 0 1 676968
 box -38 -48 4914 592
 use sky130_sc_ams__ota_1  sky130_sc_ams__ota_1_0