schematic improvements

mag/user_analog_project_wrapper.mag

diff --git a/mag/user_analog_project_wrapper.mag b/mag/user_analog_project_wrapper.mag
index efa6508..5b787c7 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 1654721934
+timestamp 1654722173
 << viali >>
 rect 531009 283461 531043 283495
 rect 537801 282968 537835 283003
@@ -429,8 +429,8 @@
 rect 578002 270525 578107 283384
 rect 578002 270515 584000 270525
 rect 578002 270420 583528 270515
-rect 583990 270420 584010 270515
-rect 578002 270410 584010 270420
+rect 583990 270420 584000 270515
+rect 578002 270410 584000 270420
 rect 531975 193873 583668 193883
 rect 531975 192902 582687 193873
 rect 583658 192902 583668 193873

netgen/user_analog_project_wrapper.spice

diff --git a/netgen/user_analog_project_wrapper.spice b/netgen/user_analog_project_wrapper.spice
index 08ec263..d06b27e 100644
--- a/netgen/user_analog_project_wrapper.spice
+++ b/netgen/user_analog_project_wrapper.spice
@@ -90,7 +90,7 @@
 + user_irq[2] user_irq[1] user_irq[0]
 x1 io_analog[4] io_analog[5] io_analog[1] io_analog[2] io_analog[3] io_analog[0] vssa1 1T1R_2x2
 x4 io_analog[10] io_analog[8] vssa2 io_analog[9] FG_pfet
-x5 gpio_analog[1] gpio_analog[0] io_analog[6] net1 vccd1 vssd1 C4
+x5 gpio_analog[1] gpio_analog[2] io_analog[6] net1 vccd1 vssd1 C4
 x3 vccd1 vccd1 vssd1 vssd1 net1 gpio_noesd[0] gpio_noesd[0] sky130_sc_ams__ota_1
 x8 gpio_analog[10] net3 net2 gpio_analog[11] gpio_analog[12] gpio_analog[9] hv_tgate
 x2 vccd2 vccd2 vssd2 vssd2 gpio_noesd[13] gpio_noesd[14] gpio_noesd[15] sky130_sc_ams__ota_1

xschem/user_analog_project_wrapper.sch

diff --git a/xschem/user_analog_project_wrapper.sch b/xschem/user_analog_project_wrapper.sch
index e564396..b715c70 100644
--- a/xschem/user_analog_project_wrapper.sch
+++ b/xschem/user_analog_project_wrapper.sch
@@ -20,9 +20,9 @@
 N -610 -990 -560 -990 { lab=io_analog[8]}
 N -480 -1080 -480 -1040 { lab=io_analog[10]}
 N 120 -1020 140 -1020 {
-lab=gpio_analog[7]}
+lab=gpio_analog[1]}
 N 120 -1000 140 -1000 {
-lab=gpio_analog[8]}
+lab=gpio_analog[2]}
 N 120 -980 140 -980 {
 lab=io_analog[6]}
 N 440 -1020 480 -1020 {
@@ -48,11 +48,11 @@
 N 1080 -879 1080 -819 {
 lab=vssd1}
 N 1160 -999 1230 -999 {
-lab=gpio_noesd[4]}
+lab=gpio_noesd[0]}
 N 910 -1019 1000 -1019 {
 lab=#net1}
 N 910 -979 1000 -979 {
-lab=gpio_noesd[4]}
+lab=gpio_noesd[0]}
 N 357 -497 357 -452 { lab=#net2}
 N 222 -372 267 -372 { lab=gpio_analog[11]}
 N 327 -452 327 -422 { lab=gpio_analog[9]}
@@ -68,13 +68,13 @@
 N 327 -322 327 -291 {
 lab=gpio_analog[10]}
 N 1070 -319 1070 -259 {
-lab=vssd1}
+lab=vssd2}
 N 1070 -259 1090 -259 {
-lab=vssd1}
+lab=vssd2}
 N 1090 -319 1090 -259 {
-lab=vssd1}
+lab=vssd2}
 N 1080 -259 1080 -199 {
-lab=vssd1}
+lab=vssd2}
 N 1070 -499 1070 -439 {
 lab=vccd2}
 N 1070 -499 1090 -499 {
@@ -132,11 +132,11 @@
 C {devices/lab_pin.sym} 480 -1000 0 1 {name=l23 sig_type=std_logic lab=vccd1}
 C {devices/lab_pin.sym} 480 -980 0 1 {name=l24 sig_type=std_logic lab=vssd1
 }
-C {devices/lab_pin.sym} 120 -1020 0 0 {name=l27 sig_type=std_logic lab=gpio_analog[7]
+C {devices/lab_pin.sym} 120 -1020 0 0 {name=l27 sig_type=std_logic lab=gpio_analog[1]
 }
-C {devices/lab_pin.sym} 120 -1000 0 0 {name=l25 sig_type=std_logic lab=gpio_analog[8]
+C {devices/lab_pin.sym} 120 -1000 0 0 {name=l25 sig_type=std_logic lab=gpio_analog[2]
 }
-C {devices/lab_pin.sym} 1230 -999 2 0 {name=l28 sig_type=std_logic lab=gpio_noesd[4]}
+C {devices/lab_pin.sym} 1230 -999 2 0 {name=l28 sig_type=std_logic lab=gpio_noesd[0]}
 C {sky130_sc_ams__ota_1.sym} 1080 -999 0 0 {name=x3}
 C {devices/lab_pin.sym} 1080 -819 0 0 {name=l17 sig_type=std_logic lab=vssd1}
 C {hv_tgate.sym} 327 -372 0 0 {name=x8}
@@ -153,7 +153,7 @@
 C {devices/lab_pin.sym} 1080 -199 0 0 {name=l10 sig_type=std_logic lab=vssd2}
 C {devices/lab_pin.sym} 1080 -599 0 0 {name=l11 sig_type=std_logic lab=vccd2
 }
-C {devices/lab_pin.sym} 910 -979 2 1 {name=l7 sig_type=std_logic lab=gpio_noesd[4]}
+C {devices/lab_pin.sym} 910 -979 2 1 {name=l7 sig_type=std_logic lab=gpio_noesd[0]}
 C {devices/lab_pin.sym} 1000 -399 0 0 {name=l12 sig_type=std_logic lab=gpio_noesd[13]}
 C {devices/lab_pin.sym} 1000 -359 0 0 {name=l13 sig_type=std_logic lab=gpio_noesd[14]}
 C {devices/lab_pin.sym} 1160 -379 0 1 {name=l14 sig_type=std_logic lab=gpio_noesd[15]}