diff --git a/src/store.c b/src/store.c
index a46e6cb1..09b7b235 100644
--- a/src/store.c
+++ b/src/store.c
@@ -317,6 +317,10 @@ void storeobject(int pos, double x1,double y1,double x2,double y2,
      } else
        xctx->rect[rectc][n].dash = 0;
      set_rect_flags(&xctx->rect[rectc][n]); /* set cached .flags bitmask from on attributes */
+     if(rectc == GRIDLAYER && (xctx->rect[rectc][n].flags & 1024)) {
+        xRect *r = &xctx->rect[GRIDLAYER][n];
+        draw_image(0, r, &r->x1, &r->y1, &r->x2, &r->y2, 0, 0);
+     }
      xctx->rects[rectc]++;
      set_modify(1);
     }
diff --git a/xschem_library/examples/mos_power_ampli.sch b/xschem_library/examples/mos_power_ampli.sch
index dd72e21b..36092a0d 100644
--- a/xschem_library/examples/mos_power_ampli.sch
+++ b/xschem_library/examples/mos_power_ampli.sch
@@ -7,8 +7,8 @@ E {}
 L 15 270 -460 340 -390 {}
 L 15 270 -330 340 -390 {}
 B 2 1520 -750 2440 -70 {flags=graph
-y1=-26.8382
-y2=73.1618
+y1=-51.3482
+y2=48.6518
 divy=4
 subdivy=4
 x1=0.0157556
diff --git a/xschem_library/examples/poweramp.sch b/xschem_library/examples/poweramp.sch
index 2d5c554a..e9caa5b6 100644
--- a/xschem_library/examples/poweramp.sch
+++ b/xschem_library/examples/poweramp.sch
@@ -14,31 +14,31 @@ L 18 900 -580 910 -580 {}
 L 18 880 -530 900 -580 {}
 L 18 880 -530 880 -450 {}
 L 18 900 -580 900 -400 {}
-B 2 1200 -330 1880 -140 {flags=graph,locked 
+B 2 1200 -330 1880 -140 {flags=graph
 y1 = 0
 y2 = .05
 divy = 5
-x1=0.0145769
-x2=0.015228
+x1=0.0145887
+x2=0.0152398
 divx=10
 node="i(v.x1.v3)"
 color="11 12 13 14" unitx=m unity=m}
-B 2 1200 -530 1880 -340 {flags=graph,locked 
+B 2 1200 -530 1880 -340 {flags=graph
 y1 = 0
 y2 = 12
 divy = 6
-x1=0.0145769
-x2=0.015228
+x1=0.0145887
+x2=0.0152398
 divx=10
 node="i(v.x1.vu) i(v.x0.vu) i(v.x1.vd) i(v.x0.vd)"
 color="11 12 13 14" unitx=m}
-B 2 1200 -860 1880 -550 {flags=graph,locked
+B 2 1200 -860 1880 -550 {flags=graph
 
 y1 = -60
 y2 = 60
 divy = 12
-x1=0.0145769
-x2=0.015228
+x1=0.0145887
+x2=0.0152398
 divx=10
 node="outp outm vpp vnn x1.vboost x0.vboost"
 color="4 5 6 12 8 10" unitx=m}
@@ -159,7 +159,9 @@ vvss vss 0 dc 0
 ** referenced file in simulation directory.
 .include \\"models_poweramp.txt\\"
 .control
-* op
+op
+write poweramp.raw
+set appendwrite
 tran  6e-7 0.03 uic
 * .FOUR 20k v(outm,outp)
 * .probe i(*) 
@@ -275,7 +277,7 @@ C {ngspice_probe.sym} 810 -240 0 1 {name=p38}
 C {ngspice_probe.sym} 300 -680 0 1 {name=p33}
 C {ngspice_probe.sym} 300 -220 0 1 {name=p30}
 C {ngspice_probe.sym} 350 -320 0 1 {name=p39}
-C {ngspice_get_expr.sym} 565 -455 0 0 {name=r18 
+C {ngspice_get_expr.sym} 535 -475 0 1 {name=r18 
 node="[ngspice::get_current \{r2[i]\}]"
 descr = current
  }
@@ -317,8 +319,8 @@ C {launcher.sym} 1000 -310 0 0 {name=h4
 descr="View Raw file" 
 tclcommand="textwindow $netlist_dir/[file tail [file rootname [ xschem get schname 0 ] ] ].raw"
 }
-C {spice_probe.sym} 360 -1220 0 0 {name=p45 analysis=tran voltage=0.0000e+00}
-C {spice_probe.sym} 360 -1060 0 0 {name=p46 analysis=tran voltage=0.0000e+00}
+C {spice_probe.sym} 360 -1220 0 0 {name=p45 analysis=tran voltage=49.84}
+C {spice_probe.sym} 360 -1060 0 0 {name=p46 analysis=tran voltage=-49.86}
 C {launcher.sym} 1095 -985 0 0 {name=h5 
 descr="Select arrow and 
 Ctrl-Left-Click to load/unload waveforms" 
diff --git a/xschem_library/rom8k/rom2_ctrl.sch b/xschem_library/rom8k/rom2_ctrl.sch
index 3bde7d50..c63515cb 100644
--- a/xschem_library/rom8k/rom2_ctrl.sch
+++ b/xschem_library/rom8k/rom2_ctrl.sch
@@ -15,7 +15,7 @@ comm="example of using tcl to replace the path
       with $path variable automatically"
 node="tcleval(v($\{path\}ldcp_ref) v($\{path\}ldprechref))"
 color=12\\ 5\\ 13}
-B 2 580 -230 1200 -140 {flags=graph
+B 2 580 -280 1200 -140 {flags=graph
 y1 = 0
 y2 = 2
 divy = 2
@@ -26,7 +26,7 @@ comm="example of using tcl to replace the path
       with $path variable automatically"
 node="tcleval(v($\{path\}ldcp_ref) v($\{path\}ldcpb))"
 color=12\\ 5\\ 8}
-B 2 580 -320 1200 -230 {flags=graph
+B 2 580 -400 1200 -280 {flags=graph
 y1 = 0
 y2 = 2
 divy = 2
@@ -37,157 +37,157 @@ comm="example of using tcl to replace the path
       with $path variable automatically"
 node="tcleval(v($\{path\}ldcp_ref) v($\{path\}ldouti) v($\{path\}ldoutib))"
 color=12\\ 5\\ 8}
-N 370 -560 510 -560 {lab=LDCPB}
-N 250 -650 260 -650 {lab=LDCPB}
-N 250 -650 250 -560 {lab=LDCPB}
-N 210 -560 250 -560 {lab=LDCPB}
-N 250 -760 250 -650 {lab=LDCPB}
-N 250 -760 260 -760 {lab=LDCPB}
-N 370 -400 430 -400 {lab=LDCPB}
-N 910 -850 910 -790 {lab=#net1}
-N 810 -760 910 -790 {lab=#net1}
-N 810 -760 810 -710 {lab=#net1}
-N 910 -750 910 -690 {lab=#net2}
-N 810 -780 910 -750 {lab=#net2}
-N 810 -830 810 -780 {lab=#net2}
-N 1360 -130 1360 -80 {lab=VSS}
-N 990 -850 1010 -850 {lab=LDOUTIB}
-N 1080 -400 1120 -400 {lab=LDPRECHREF}
-N 370 -560 370 -400 {lab=LDCPB}
-N 420 -760 440 -760 {lab=#net3}
-N 250 -560 370 -560 {lab=LDCPB}
-N 1360 -210 1360 -190 {lab=#net4}
-N 1320 -240 1320 -160 {lab=LDOUTI}
-N 1360 -390 1360 -370 {lab=LDYMSREF}
-N 1360 -290 1360 -270 {lab=#net5}
-N 1520 -210 1520 -190 {lab=#net6}
-N 1480 -240 1480 -160 {lab=LDOUTI}
-N 1360 -130 1520 -130 {lab=VSS}
-N 1520 -290 1520 -270 {lab=#net7}
+N 360 -670 500 -670 {lab=LDCPB}
+N 240 -760 250 -760 {lab=LDCPB}
+N 240 -760 240 -670 {lab=LDCPB}
+N 200 -670 240 -670 {lab=LDCPB}
+N 240 -870 240 -760 {lab=LDCPB}
+N 240 -870 250 -870 {lab=LDCPB}
+N 360 -510 420 -510 {lab=LDCPB}
+N 900 -960 900 -900 {lab=#net1}
+N 800 -870 900 -900 {lab=#net1}
+N 800 -870 800 -820 {lab=#net1}
+N 900 -860 900 -800 {lab=#net2}
+N 800 -890 900 -860 {lab=#net2}
+N 800 -940 800 -890 {lab=#net2}
+N 1350 -240 1350 -190 {lab=VSS}
+N 980 -960 1000 -960 {lab=LDOUTIB}
+N 1070 -510 1110 -510 {lab=LDPRECHREF}
+N 360 -670 360 -510 {lab=LDCPB}
+N 410 -870 430 -870 {lab=#net3}
+N 240 -670 360 -670 {lab=LDCPB}
+N 1350 -320 1350 -300 {lab=#net4}
+N 1310 -350 1310 -270 {lab=LDOUTI}
+N 1350 -500 1350 -480 {lab=LDYMSREF}
+N 1350 -400 1350 -380 {lab=#net5}
+N 1510 -320 1510 -300 {lab=#net6}
+N 1470 -350 1470 -270 {lab=LDOUTI}
+N 1350 -240 1510 -240 {lab=VSS}
+N 1510 -400 1510 -380 {lab=#net7}
 C {title.sym} 170 0 0 0 {name=l3 author="Stefan Schippers"}
-C {opin.sym} 260 -230 0 0 { name=p1 lab=LDPRECH }
-C {opin.sym} 260 -210 0 0 { name=p2 lab=LDSAL}
-C {opin.sym} 260 -190 0 0 { name=p3 lab=LDCP_ROWDEC }
-C {opin.sym} 260 -170 0 0 { name=p4 lab=LDCP_SA}
-C {opin.sym} 260 -150 0 0 { name=p5 lab=LDCP_ADDLAT_B }
-C {opin.sym} 260 -130 0 0 { name=p6 lab=LDCP_COL_B }
-C {ipin.sym} 210 -170 0 0 { name=p49 lab=LDEN_LAT }
-C {ipin.sym} 210 -150 0 0 { name=p50 lab=LDCP }
-C {ipin.sym} 210 -130 0 0 { name=p51 lab=VCC }
-C {ipin.sym} 210 -110 0 0 { name=p52 lab=VSS }
-C {lab_wire.sym} 270 -560 0 0 {name=l19 lab=LDCPB}
-C {capa.sym} 280 -530 0 0 {name=c84 m=1 value=5f}
-C {lab_pin.sym} 280 -500 0 0 {name=p1109 lab=VSS}
-C {lab_pin.sym} 340 -650 0 1 {name=p1111 lab=LDCP_SA}
-C {lvnand2.sym} 150 -560 0 0 {name=x392 m=1 
+C {opin.sym} 250 -340 0 0 { name=p1 lab=LDPRECH }
+C {opin.sym} 250 -320 0 0 { name=p2 lab=LDSAL}
+C {opin.sym} 250 -300 0 0 { name=p3 lab=LDCP_ROWDEC }
+C {opin.sym} 250 -280 0 0 { name=p4 lab=LDCP_SA}
+C {opin.sym} 250 -260 0 0 { name=p5 lab=LDCP_ADDLAT_B }
+C {opin.sym} 250 -240 0 0 { name=p6 lab=LDCP_COL_B }
+C {ipin.sym} 200 -280 0 0 { name=p49 lab=LDEN_LAT }
+C {ipin.sym} 200 -260 0 0 { name=p50 lab=LDCP }
+C {ipin.sym} 200 -240 0 0 { name=p51 lab=VCC }
+C {ipin.sym} 200 -220 0 0 { name=p52 lab=VSS }
+C {lab_wire.sym} 260 -670 0 0 {name=l19 lab=LDCPB}
+C {capa.sym} 270 -640 0 0 {name=c84 m=1 value=5f}
+C {lab_pin.sym} 270 -610 0 0 {name=p1109 lab=VSS}
+C {lab_pin.sym} 330 -760 0 1 {name=p1111 lab=LDCP_SA}
+C {lvnand2.sym} 140 -670 0 0 {name=x392 m=1 
 + wna=90u lna=2.4u wpa=60u lpa=2.4u
 + wnb=90u lnb=2.4u wpb=60u lpb=2.4u
 + VCCPIN=vcc VSSPIN=vss }
-C {lab_pin.sym} 110 -580 0 0 {name=p1113 lab=LDCP}
-C {lab_pin.sym} 110 -540 0 0 {name=p1114 lab=LDEN_LAT}
-C {lab_pin.sym} 420 -890 0 1 {name=p1115 lab=LDCP_ADDLAT_B}
-C {lvnot.sym} 300 -650 0 0 {name=x394 m=1 
+C {lab_pin.sym} 100 -690 0 0 {name=p1113 lab=LDCP}
+C {lab_pin.sym} 100 -650 0 0 {name=p1114 lab=LDEN_LAT}
+C {lab_pin.sym} 410 -1000 0 1 {name=p1115 lab=LDCP_ADDLAT_B}
+C {lvnot.sym} 290 -760 0 0 {name=x394 m=1 
 + wn=8.4u lln=2.8u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss
 }
-C {lvnot.sym} 480 -760 0 0 {name=x395 m=10
+C {lvnot.sym} 470 -870 0 0 {name=x395 m=10
 + wn=15u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lvnot.sym} 300 -760 0 0 {name=x396 m=1 
+C {lvnot.sym} 290 -870 0 0 {name=x396 m=1 
 + wn=15u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lvnot.sym} 380 -760 0 0 {name=x397 m=4 
+C {lvnot.sym} 370 -870 0 0 {name=x397 m=4 
 + wn=15u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 520 -760 0 1 {name=p1116 lab=LDCP_ROWDEC}
-C {lab_pin.sym} 590 -400 0 1 {name=p1117 lab=LDCP_COL_B}
-C {lvnot.sym} 380 -890 0 0 {name=x405 m=1 
+C {lab_pin.sym} 510 -870 0 1 {name=p1116 lab=LDCP_ROWDEC}
+C {lab_pin.sym} 580 -510 0 1 {name=p1117 lab=LDCP_COL_B}
+C {lvnot.sym} 370 -1000 0 0 {name=x405 m=1 
 + wn=30u lln=2.4u wp=80u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 340 -890 0 0 {name=p1118 lab=LDCP}
-C {lab_pin.sym} 590 -560 0 1 {name=p7 lab=LDCP_REF}
-C {lab_pin.sym} 990 -690 0 1 {name=p22 lab=LDOUTI}
-C {lvnot.sym} 900 -520 0 0 {name=x7 m=1 
+C {lab_pin.sym} 330 -1000 0 0 {name=p1118 lab=LDCP}
+C {lab_pin.sym} 580 -670 0 1 {name=p7 lab=LDCP_REF}
+C {lab_pin.sym} 980 -800 0 1 {name=p22 lab=LDOUTI}
+C {lvnot.sym} 890 -630 0 0 {name=x7 m=1 
 + wn=24u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 860 -520 0 0 {name=p10 lab=VSS}
-C {lvnor2.sym} 1020 -400 0 0 {name=x8 m=1 
+C {lab_pin.sym} 850 -630 0 0 {name=p10 lab=VSS}
+C {lvnor2.sym} 1010 -510 0 0 {name=x8 m=1 
 + wna=8.4u lna=2.4u wpa=70u lpa=2.4u
 + wnb=8.4u lnb=2.4u wpb=70u lpb=2.4u
 + VCCPIN=VCC VSSPIN=VSS}
-C {lab_pin.sym} 980 -380 0 0 {name=p29 lab=LDOUTI}
-C {lab_pin.sym} 940 -520 0 1 {name=p30 lab=LDCP_REF_B}
-C {lvnand2.sym} 850 -850 0 0 {name=x18 m=1 
+C {lab_pin.sym} 970 -490 0 0 {name=p29 lab=LDOUTI}
+C {lab_pin.sym} 930 -630 0 1 {name=p30 lab=LDCP_REF_B}
+C {lvnand2.sym} 840 -960 0 0 {name=x18 m=1 
 + wna=20u lna=2.4u wpa=36u lpa=2.4u
 + wnb=20u lnb=2.4u wpb=36u lpb=2.4u
 + VCCPIN=VCC VSSPIN=VSS}
-C {lvnand2.sym} 850 -690 2 1 {name=x3 m=1 
+C {lvnand2.sym} 840 -800 2 1 {name=x3 m=1 
 + wna=30u lna=2.4u wpa=30u lpa=2.4u
 + wnb=30u lnb=2.4u wpb=30u lpb=2.4u
 + VCCPIN=VCC VSSPIN=VSS}
-C {lab_pin.sym} 810 -670 0 0 {name=p11 lab=LDCP_REF}
-C {lab_pin.sym} 810 -870 0 0 {name=p43 lab=LDQ_B}
-C {lab_pin.sym} 1360 -80 0 0 {name=p63 lab=VSS}
-C {nlv.sym} 1340 -160 0 0 {name=m15 model=cmosn w=4u l=2.4u m=1}
-C {lvnand3.sym} 1280 -680 0 0 {name=x25 m=1 
+C {lab_pin.sym} 800 -780 0 0 {name=p11 lab=LDCP_REF}
+C {lab_pin.sym} 800 -980 0 0 {name=p43 lab=LDQ_B}
+C {lab_pin.sym} 1350 -190 0 0 {name=p63 lab=VSS}
+C {nlv.sym} 1330 -270 0 0 {name=m15 model=cmosn w=4u l=2.4u m=1}
+C {lvnand3.sym} 1270 -790 0 0 {name=x25 m=1 
 + wn=80u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=VCC VSSPIN=VSS}
-C {lab_pin.sym} 1240 -700 0 0 {name=p24 lab=LDCP_REF}
-C {lab_pin.sym} 1240 -680 0 0 {name=p27 lab=LDQ_B}
-C {lab_pin.sym} 1240 -660 0 0 {name=p66 lab=LDOUTI}
-C {lab_pin.sym} 1420 -680 0 1 {name=p67 lab=LDSAL}
-C {lvnot.sym} 1380 -680 0 0 {name=x26 m=4 
+C {lab_pin.sym} 1230 -810 0 0 {name=p24 lab=LDCP_REF}
+C {lab_pin.sym} 1230 -790 0 0 {name=p27 lab=LDQ_B}
+C {lab_pin.sym} 1230 -770 0 0 {name=p66 lab=LDOUTI}
+C {lab_pin.sym} 1410 -790 0 1 {name=p67 lab=LDSAL}
+C {lvnot.sym} 1370 -790 0 0 {name=x26 m=4 
 + wn=13u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 1420 -860 0 1 {name=p68 lab=LDPRECH}
-C {lvnot.sym} 1380 -860 0 0 {name=x28 m=8 
+C {lab_pin.sym} 1410 -970 0 1 {name=p68 lab=LDPRECH}
+C {lvnot.sym} 1370 -970 0 0 {name=x28 m=8 
 + wn=13u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 1010 -850 0 1 {name=p15 lab=LDOUTIB}
-C {lvnot.sym} 550 -560 0 0 {name=x4 m=2 
+C {lab_pin.sym} 1000 -960 0 1 {name=p15 lab=LDOUTIB}
+C {lvnot.sym} 540 -670 0 0 {name=x4 m=2 
 + wn=13u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lvnot.sym} 550 -400 0 0 {name=x1 m=2 
+C {lvnot.sym} 540 -510 0 0 {name=x1 m=2 
 + wn=20u lln=2.4u wp=44u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lvnot.sym} 470 -400 0 0 {name=x6 m=1 
+C {lvnot.sym} 460 -510 0 0 {name=x6 m=1 
 + wn=8.4u lln=2.4u wp=16u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {iopin.sym} 260 -110 0 0 { name=p20 lab=LDYMSREF }
-C {lvnot.sym} 950 -850 0 0 {name=x5 m=1 
+C {iopin.sym} 250 -220 0 0 { name=p20 lab=LDYMSREF }
+C {lvnot.sym} 940 -960 0 0 {name=x5 m=1 
 + wn=30u lln=2.4u wp=40u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lvnot.sym} 950 -690 0 0 {name=x9 m=2 
+C {lvnot.sym} 940 -800 0 0 {name=x9 m=2 
 + wn=12u lln=2.4u wp=30u lp=2.4u
 + VCCPIN=vcc VSSPIN=vss}
-C {lab_pin.sym} 1600 -500 0 1 {name=p17 lab=LDYMSREF}
-C {lab_pin.sym} 1600 -520 0 1 {name=p18 lab=LDQ_B}
-C {lab_pin.sym} 1300 -520 0 0 {name=p21 lab=LDPRECHREF}
-C {lab_pin.sym} 1300 -500 0 0 {name=p23 lab=VCC}
-C {lab_pin.sym} 1300 -480 0 0 {name=p26 lab=VSS}
-C {lab_pin.sym} 1600 -540 0 1 {name=p32 lab=LDQI}
-C {lab_pin.sym} 1120 -400 0 1 {name=p9 lab=LDPRECHREF}
-C {noconn.sym} 1580 -640 0 0 {name=l1}
-C {lab_pin.sym} 1580 -640 0 1 {name=p33 lab=LDQI}
-C {lab_pin.sym} 1360 -390 0 1 {name=p12 lab=LDYMSREF}
-C {rom2_sacell.sym} 1450 -510 0 0 {name=xsacell}
-C {lab_pin.sym} 1320 -160 0 0 {name=p13 lab=LDOUTI}
-C {spice_probe.sym} 590 -560 0 0 {name=p95 analysis=tran}
-C {spice_probe.sym} 1080 -400 0 0 {name=p19 analysis=tran}
-C {spice_probe.sym} 990 -690 0 0 {name=p28 analysis=tran}
-C {spice_probe.sym} 990 -850 0 0 {name=p31 analysis=tran}
-C {spice_probe.sym} 1600 -540 0 0 {name=p34 analysis=tran}
-C {spice_probe.sym} 810 -870 0 1 {name=p35 analysis=tran}
-C {nlv.sym} 1340 -240 0 0 {name=m1 model=cmosn w=4u l=2.4u m=1}
-C {lvnand3.sym} 1280 -860 0 0 {name=x2 m=1 
+C {lab_pin.sym} 1590 -610 0 1 {name=p17 lab=LDYMSREF}
+C {lab_pin.sym} 1590 -630 0 1 {name=p18 lab=LDQ_B}
+C {lab_pin.sym} 1290 -630 0 0 {name=p21 lab=LDPRECHREF}
+C {lab_pin.sym} 1290 -610 0 0 {name=p23 lab=VCC}
+C {lab_pin.sym} 1290 -590 0 0 {name=p26 lab=VSS}
+C {lab_pin.sym} 1590 -650 0 1 {name=p32 lab=LDQI}
+C {lab_pin.sym} 1110 -510 0 1 {name=p9 lab=LDPRECHREF}
+C {noconn.sym} 1570 -750 0 0 {name=l1}
+C {lab_pin.sym} 1570 -750 0 1 {name=p33 lab=LDQI}
+C {lab_pin.sym} 1350 -500 0 1 {name=p12 lab=LDYMSREF}
+C {rom2_sacell.sym} 1440 -620 0 0 {name=xsacell}
+C {lab_pin.sym} 1310 -270 0 0 {name=p13 lab=LDOUTI}
+C {spice_probe.sym} 580 -670 0 0 {name=p95 analysis=tran}
+C {spice_probe.sym} 1070 -510 0 0 {name=p19 analysis=tran}
+C {spice_probe.sym} 980 -800 0 0 {name=p28 analysis=tran}
+C {spice_probe.sym} 980 -960 0 0 {name=p31 analysis=tran}
+C {spice_probe.sym} 1590 -650 0 0 {name=p34 analysis=tran}
+C {spice_probe.sym} 800 -980 0 1 {name=p35 analysis=tran}
+C {nlv.sym} 1330 -350 0 0 {name=m1 model=cmosn w=4u l=2.4u m=1}
+C {lvnand3.sym} 1270 -970 0 0 {name=x2 m=1 
 + wn=80u lln=2.4u wp=60u lp=2.4u
 + VCCPIN=VCC VSSPIN=VSS}
-C {lab_pin.sym} 1240 -840 0 0 {name=p36 lab=LDCP}
-C {lab_pin.sym} 1240 -860 0 0 {name=p37 lab=LDEN_LAT}
-C {lab_pin.sym} 1240 -880 0 0 {name=p38 lab=LDOUTIB}
-C {lab_pin.sym} 980 -420 0 0 {name=p8 lab=LDCPB}
-C {nlv.sym} 1500 -160 0 0 {name=m2 model=cmosn w=4u l=2.4u m=1}
-C {lab_pin.sym} 1480 -160 0 0 {name=p0 lab=LDOUTI}
-C {nlv.sym} 1500 -240 0 0 {name=m0 model=cmosn w=4u l=2.4u m=1}
-C {spice_probe.sym} 410 -560 0 0 {name=p25 analysis=tran}
-C {lab_pin.sym} 1300 -540 0 0 {name=p14 lab=LDCPB}
+C {lab_pin.sym} 1230 -950 0 0 {name=p36 lab=LDCP}
+C {lab_pin.sym} 1230 -970 0 0 {name=p37 lab=LDEN_LAT}
+C {lab_pin.sym} 1230 -990 0 0 {name=p38 lab=LDOUTIB}
+C {lab_pin.sym} 970 -530 0 0 {name=p8 lab=LDCPB}
+C {nlv.sym} 1490 -270 0 0 {name=m2 model=cmosn w=4u l=2.4u m=1}
+C {lab_pin.sym} 1470 -270 0 0 {name=p0 lab=LDOUTI}
+C {nlv.sym} 1490 -350 0 0 {name=m0 model=cmosn w=4u l=2.4u m=1}
+C {spice_probe.sym} 400 -670 0 0 {name=p25 analysis=tran}
+C {lab_pin.sym} 1290 -650 0 0 {name=p14 lab=LDCPB}
diff --git a/xschem_library/rom8k/rom8k.sch b/xschem_library/rom8k/rom8k.sch
index b5e1fe40..f8f73ed8 100644
--- a/xschem_library/rom8k/rom8k.sch
+++ b/xschem_library/rom8k/rom8k.sch
@@ -32,8 +32,8 @@ y1 = -0.048929
 y2 = 0.999755
 divy = 3
 subdivy=1
-x1=1.41996e-07
-x2=2.02558e-07  divx=10
+x1=1.48222e-07
+x2=1.94606e-07  divx=10
 node="
 ldbl[0] ldbl[16] ldbl[32]
 ldbl[1] ldbl[17] ldbl[33]
@@ -47,8 +47,8 @@ y1 = -0.021
 y2 = 1.5
 subdivy=1
 divy = 4
-x1=1.58347e-07
-x2=2.18909e-07
+x1=1.48222e-07
+x2=1.94606e-07
 divx=10
 subdivx=4
 node="ldcp ldyms[4] ldyms[5] ldyms[6] ldymsref"
@@ -61,8 +61,8 @@ y2 = 1.6
 divy = 3
 subdivy=0
 subdivx = 1
-x1=1.41996e-07
-x2=2.02558e-07  divx=10
+x1=1.48222e-07
+x2=1.94606e-07  divx=10
 node="
 ldwl[0] ldwl[1] ldwl[2] ldwl[3] 
 ldwl[4] ldwl[5] ldwl[6] ldwl[16] 
@@ -70,21 +70,24 @@ ldwl[7] ldwl[8] ldwl[9]"
 color="4 5 4 5 4 5 4 5 4 5 4 5"  
 unitx=n 
 }
-B 2 1840 -1000 2890 -540 {flags=graph_unlocked
+B 2 1840 -1000 2890 -540 {flags=graph,unlocked
 digital=1
 y1 = 0
 y2 = 1.6
 ypos1=0.0694741
 ypos2=2.61557
 divy = 1
-x1=2.07427e-07
-x2=2.67989e-07
+x1=1.48222e-07
+x2=1.94606e-07
 divx=12
 subdivx=4
 node="
 ---In/Out---
 ldcp
-ldq[15] ldq[14] ldq[13] ldq[12]
+ldq[15]
+ldq[14]
+ldq[13]
+ldq[12]
 LDA,lda[12],lda[11],lda[10],lda[9],lda[8],lda[7],lda[6],lda[5],lda[4],lda[3],lda[2],lda[1],lda[0]
 LDQ,ldq[15],ldq[14],ldq[13],ldq[12],ldq[11],ldq[10],ldq[9],ldq[8],ldq[7],ldq[6],ldq[5],ldq[4],ldq[3],ldq[2],ldq[1],ldq[0]
 ---Timing---
@@ -104,8 +107,8 @@ B 2 1840 -1300 2890 -1160 {flags=graph_unlocked
 y1 = -0.022
 y2 = 1.6
 divy = 4
-x1=1.84671e-07
-x2=2.45233e-07
+x1=1.48222e-07
+x2=1.94606e-07
 divx=8
 unitx=n
 node="xsa[0].ldqib xsa[5].ldqib xsa[0].ldsali xctrl.ldq_b"
@@ -115,8 +118,8 @@ B 2 1840 -240 2890 0 {flags=graph_unlocked
 y1 = -0.0559946
 y2 = 0.0205097
 divy = 5
-x1=1.41996e-07
-x2=2.02558e-07  
+x1=1.48222e-07
+x2=1.94606e-07  
 unity=m
 divx=10
 subdivx=1