diff --git a/mag/spamp.mag b/mag/spamp.mag
index b6c1932..e3dd77a 100644
--- a/mag/spamp.mag
+++ b/mag/spamp.mag
@@ -1,232 +1,9 @@
 magic
 tech sky130A
-timestamp 1633032407
-<< error_p >>
-rect -535 1149 -518 1150
-rect -535 1130 -518 1131
-rect -104 -37 -87 -36
-rect 134 -39 151 -38
-rect 21 -407 38 -406
-<< nwell >>
-rect -2673 6125 2341 7034
-rect -185 200 86 6125
-rect -286 -136 347 200
-<< pwell >>
-rect -1557 194 -1031 320
-<< nmos >>
-rect -1344 207 -1244 307
-<< pmos >>
-rect -27 -97 73 3
-<< ndiff >>
-rect -1544 281 -1344 307
-rect -1544 229 -1535 281
-rect -1483 229 -1344 281
-rect -1544 207 -1344 229
-rect -1244 279 -1044 307
-rect -1244 228 -1117 279
-rect -1065 228 -1044 279
-rect -1244 207 -1044 228
-<< pdiff >>
-rect -123 -19 -27 3
-rect -123 -37 -104 -19
-rect -87 -37 -27 -19
-rect -123 -53 -27 -37
-rect -123 -71 -104 -53
-rect -87 -71 -27 -53
-rect -123 -97 -27 -71
-rect 73 -21 177 3
-rect 73 -39 134 -21
-rect 151 -39 177 -21
-rect 73 -55 177 -39
-rect 73 -73 134 -55
-rect 151 -73 177 -55
-rect 73 -97 177 -73
-<< ndiffc >>
-rect -1535 229 -1483 281
-rect -1117 228 -1065 279
-<< pdiffc >>
-rect -104 -37 -87 -19
-rect -104 -71 -87 -53
-rect 134 -39 151 -21
-rect 134 -73 151 -55
-<< nsubdiff >>
-rect -545 6538 832 6592
-rect -545 6419 -149 6538
-rect 38 6419 832 6538
-rect -545 6321 832 6419
-<< nsubdiffcont >>
-rect -149 6419 38 6538
-<< poly >>
-rect -1344 307 -1244 385
-rect -1344 -43 -1244 207
-rect -27 3 73 42
-rect -1344 -60 -1301 -43
-rect -1283 -60 -1244 -43
-rect -1344 -115 -1244 -60
-rect -27 -389 73 -97
-rect -27 -407 21 -389
-rect 38 -407 73 -389
-rect -27 -423 73 -407
-rect -27 -441 21 -423
-rect 38 -441 73 -423
-rect -27 -458 73 -441
-<< polycont >>
-rect -1301 -60 -1283 -43
-rect 21 -407 38 -389
-rect 21 -441 38 -423
-<< xpolycontact >>
-rect -1153 5717 -973 6081
-rect -2355 4764 -2160 5124
-rect 1178 5065 1341 5421
-rect -1175 383 -995 747
-rect 2039 4956 2208 5310
-rect -2355 -482 -2160 -122
-rect 1171 -163 1356 207
-rect 2017 -496 2186 -142
-<< xpolyres >>
-rect -2306 -122 -2271 4764
-rect -1092 747 -1057 5717
-rect 1261 207 1296 5065
-rect 2122 -142 2157 4956
-<< locali >>
-rect -2086 6666 1949 6737
-rect -2086 6360 -1965 6666
-rect -1588 6663 1949 6666
-rect -1588 6538 1498 6663
-rect -1588 6419 -149 6538
-rect 38 6419 1498 6538
-rect -1588 6360 1498 6419
-rect -2086 6357 1498 6360
-rect 1839 6357 1949 6663
-rect -2086 6295 1949 6357
-rect -1157 6081 -968 6295
-rect -1157 6067 -1153 6081
-rect -1159 5868 -1153 6067
-rect -2711 5822 -1486 5828
-rect -3412 5647 -1486 5822
-rect -973 6067 -968 6081
-rect -973 5868 -966 6067
-rect -3412 5378 -3299 5647
-rect -2994 5628 -1486 5647
-rect -2994 5378 -1897 5628
-rect -3412 5359 -1897 5378
-rect -1592 5359 -1486 5628
-rect 1614 5462 1880 6295
-rect -3412 5222 -1486 5359
-rect 671 5264 933 5276
-rect -3412 5216 -2187 5222
-rect -2364 5124 -2187 5216
-rect 671 5151 1178 5264
-rect -2364 4925 -2355 5124
-rect -2160 4917 -1542 4943
-rect -2160 4764 -1478 4917
-rect -2344 4752 -1478 4764
-rect -1657 281 -1478 4752
-rect -598 1167 -450 1217
-rect -598 1149 -535 1167
-rect -518 1149 -450 1167
-rect -598 1131 -450 1149
-rect -598 1113 -535 1131
-rect -518 1113 -450 1131
-rect -598 655 -450 1113
-rect 671 655 933 5151
-rect 1614 5329 2183 5462
-rect 1614 5317 1880 5329
-rect 2031 5310 2176 5329
-rect 2031 5127 2039 5310
-rect -830 513 945 655
-rect -1657 229 -1535 281
-rect -1483 229 -1478 281
-rect -1657 168 -1478 229
-rect -1141 279 -1037 383
-rect -1141 228 -1117 279
-rect -1065 228 -1037 279
-rect -1141 211 -1037 228
-rect -1141 177 -1040 211
-rect -1321 9 -68 10
-rect -1365 2 -68 9
-rect 108 2 1171 12
-rect -1365 -19 -55 2
-rect -1365 -37 -104 -19
-rect -87 -37 -55 -19
-rect -1365 -43 -55 -37
-rect -1365 -60 -1301 -43
-rect -1283 -53 -55 -43
-rect -1283 -60 -104 -53
-rect -1365 -71 -104 -60
-rect -87 -71 -55 -53
-rect -1365 -97 -55 -71
-rect 107 -21 1171 2
-rect 107 -39 134 -21
-rect 151 -39 1171 -21
-rect 107 -55 1171 -39
-rect 107 -73 134 -55
-rect 151 -73 1171 -55
-rect 107 -97 1171 -73
-rect -1365 -99 -68 -97
-rect 108 -109 1171 -97
-rect -2466 -454 -2355 -360
-rect -2160 -365 -2138 -360
-rect -2160 -368 33 -365
-rect -2160 -389 2017 -368
-rect -2160 -407 21 -389
-rect 38 -407 2017 -389
-rect -2160 -423 2017 -407
-rect -2160 -441 21 -423
-rect 38 -441 2017 -423
-rect -2160 -451 2017 -441
-rect -2160 -454 79 -451
-rect -30 -754 79 -454
-rect 2186 -451 2227 -368
-rect -30 -772 3 -754
-rect 20 -772 39 -754
-rect 56 -772 79 -754
-rect -30 -805 79 -772
-<< viali >>
-rect -1965 6360 -1588 6666
-rect 1498 6357 1839 6663
-rect -3299 5378 -2994 5647
-rect -1897 5359 -1592 5628
-rect -535 1149 -518 1167
-rect -535 1113 -518 1131
-rect 3 -772 20 -754
-rect 39 -772 56 -754
-<< metal1 >>
-rect -2086 6666 1949 6737
-rect -2086 6360 -1965 6666
-rect -1588 6663 1949 6666
-rect -1588 6360 1498 6663
-rect -2086 6357 1498 6360
-rect 1839 6357 1949 6663
-rect -2086 6295 1949 6357
-rect -2711 5822 -1486 5828
-rect -3412 5647 -1486 5822
-rect -3412 5378 -3299 5647
-rect -2994 5628 -1486 5647
-rect -2994 5378 -1897 5628
-rect -3412 5359 -1897 5378
-rect -1592 5359 -1486 5628
-rect -3412 5222 -1486 5359
-rect -3412 5216 -2187 5222
-rect -598 1167 -462 1211
-rect -598 1149 -535 1167
-rect -518 1149 -462 1167
-rect -598 1131 -462 1149
-rect -598 1113 -535 1131
-rect -518 1113 -462 1131
-rect -598 1075 -462 1113
-rect -50 -754 109 -714
-rect -50 -772 3 -754
-rect 20 -772 39 -754
-rect 56 -772 109 -754
-rect -50 -811 109 -772
+timestamp 1629117458
 << labels >>
-rlabel metal1 s 3 -786 58 -740 4 vin
-port 1 nsew
-rlabel metal1 s -548 1112 -505 1168 4 vout
-port 2 nsew
-rlabel metal1 s -255 6390 143 6617 4 vdd
-port 3 nsew
-rlabel metal1 s -2648 5354 -2269 5582 4 gnd
-port 4 nsew
+rlabel metal1 3 -786 58 -740 1 vin
+rlabel viali -548 1112 -505 1168 1 vout
+rlabel metal1 -255 6390 143 6617 1 vdd
+rlabel metal1 -2648 5354 -2269 5582 1 gnd
 << end >>
diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index ee36520..807b3c2 100644
--- a/mag/user_analog_project_wrapper.mag
+++ b/mag/user_analog_project_wrapper.mag
@@ -1,58 +1,25 @@
 magic
 tech sky130A
-timestamp 1633038017
-<< error_s >>
-rect 57925 321118 57942 321119
-rect 57925 321099 57942 321100
-rect 58356 319932 58373 319933
-rect 58594 319930 58611 319931
-rect 58481 319562 58498 319563
-<< locali >>
-rect 55308 326058 56772 326567
-rect 55308 325230 55563 326058
-rect 56263 325230 56772 326058
-rect 55308 323067 56772 325230
-rect 59190 324785 60399 325676
-rect 59190 324212 59508 324785
-rect 60271 324212 60399 324785
-rect 59190 322813 60399 324212
-rect 55245 319886 56708 321476
-rect 55245 319377 55372 319886
-rect 56263 319377 56708 319886
-rect 55245 319250 56708 319377
-rect 58617 319886 60526 321476
-rect 58617 319313 59317 319886
-rect 60080 319313 60526 319886
-<< viali >>
-rect 55563 325230 56263 326058
-rect 59508 324212 60271 324785
-rect 55372 319377 56263 319886
-rect 59317 319313 60080 319886
+timestamp 1633179678
 << metal1 >>
-rect 50424 326948 53081 327138
-rect 50424 326058 57026 326948
-rect 50424 325230 55563 326058
-rect 56263 325230 57026 326058
-rect 62090 325422 63697 325499
-rect 50424 325011 57026 325230
-rect 52509 324721 57026 325011
-rect 59317 324785 63697 325422
-rect 59317 324212 59508 324785
-rect 60271 324212 63697 324785
-rect 59317 324156 63697 324212
-rect 59317 324022 63007 324156
-rect 55245 319886 56454 320395
-rect 55245 319377 55372 319886
-rect 56263 319377 56454 319886
-rect 55245 319032 56454 319377
-rect 58999 319886 60399 320395
-rect 58999 319313 59317 319886
-rect 60080 319313 60399 319886
-rect 58999 319032 60399 319313
-rect 55245 318741 56526 319032
-rect 55266 314701 56526 318741
-rect 58999 318359 60493 319032
-rect 59104 314667 60493 318359
+rect 50424 327107 52388 327138
+rect 50416 325011 52388 327107
+rect 54413 325034 55676 331800
+rect 61376 326958 63388 327000
+rect 57890 325776 63471 326958
+rect 50416 321578 52184 325011
+rect 50416 320724 58120 321578
+rect 50416 320602 52184 320724
+rect 55295 318305 58506 319261
+rect 55266 318163 58506 318305
+rect 59104 318266 60493 318305
+rect 55266 314701 56526 318163
+rect 59104 315777 60493 315901
+rect 61376 315777 63388 325776
+rect 59104 315756 63388 315777
+rect 59011 314387 63388 315756
+rect 59114 313557 63388 314387
+rect 61376 313453 63388 313557
 << metal2 >>
 rect 262 -400 318 240
 rect 853 -400 909 240
@@ -736,8 +703,8 @@
 << via4 >>
 rect 9557 351157 10138 351632
 rect 84160 351202 84572 351498
+rect 54739 329884 55513 331066
 rect 50637 325623 51913 326687
-rect 62173 324569 62974 324905
 rect 55595 314921 56033 315304
 rect 59444 314744 60347 315286
 rect 121 280581 609 281184
@@ -752,14 +719,17 @@
 rect 83460 351202 84160 351498
 rect 84572 351202 84983 351498
 rect 83460 349223 84983 351202
+rect 83460 331895 84954 349223
+rect 54462 331066 84954 331895
+rect 54462 329884 54739 331066
+rect 55513 329884 84954 331066
+rect 54462 329497 84954 329884
 rect 8765 327006 10463 328933
 rect 8765 326687 52232 327006
 rect 8765 325623 50637 326687
 rect 51913 325623 52232 326687
 rect 8765 325590 52232 325623
 rect 9251 325091 52232 325590
-rect 83460 325246 84954 349223
-rect 84902 324473 84954 325246
 rect 54883 315304 57383 315554
 rect 54883 314921 55595 315304
 rect 56033 314921 57383 315304
@@ -776,13 +746,15 @@
 rect 609 280581 57497 281184
 rect 60 280391 57497 280581
 rect 4718 280089 57497 280391
-rect 54883 276755 57383 280089
-rect 58910 278128 60847 287652
+rect 54883 280069 57383 280089
+rect 58910 278915 60847 287652
+rect 58860 277805 60918 278915
+rect 58860 277422 60974 277805
 rect 133 108870 3341 109043
 rect 133 108386 155 108870
 rect 501 108517 3341 108870
 rect 21670 108564 35212 108621
-rect 59061 108564 60974 277805
+rect 59061 108564 60974 277422
 rect 21670 108517 60974 108564
 rect 501 108386 60974 108517
 rect 133 108097 60974 108386
@@ -790,18 +762,13 @@
 rect 21670 107914 60974 108051
 rect 33870 107733 60974 107914
 rect 59061 107587 60974 107733
-<< rm5 >>
-rect 62090 324905 84902 325246
-rect 62090 324569 62173 324905
-rect 62974 324569 84902 324905
-rect 62090 324370 84902 324569
 << comment >>
 rect -50 352000 292050 352050
 rect -50 0 0 352000
 rect 292000 0 292050 352000
 rect -50 -50 292050 0
 use spamp  spamp_0
-timestamp 1633032407
+timestamp 1629117458
 transform 1 0 58460 0 1 319969
 box -3412 -811 2341 7034
 << labels >>
@@ -2161,14 +2128,6 @@
 port 676 nsew signal input
 flabel metal2 s 3217 -400 3273 240 0 FreeSans 560 90 0 0 wbs_we_i
 port 677 nsew signal input
-flabel locali 55541 323434 56438 324203 0 FreeMono 8000 0 0 0 Vout
-port 678 nsew
-flabel locali 59354 322921 60251 323690 0 FreeMono 8000 0 0 0 Vin
-port 679 nsew
-flabel locali 55573 320645 56470 321414 0 FreeMono 8000 0 0 0 gnd
-port 680 nsew
-flabel locali 59131 320640 60028 321409 0 FreeMono 8000 0 0 0 Vdd
-port 681 nsew
 << properties >>
 string FIXED_BBOX 0 0 584000 704000
 << end >>