diff --git a/src/ngspice_backannotate.tcl b/src/ngspice_backannotate.tcl
index da7336ed..ad3ea53e 100644
--- a/src/ngspice_backannotate.tcl
+++ b/src/ngspice_backannotate.tcl
@@ -115,8 +115,7 @@ proc ngspice::get_current {n} {
   set n $path$n
   if { $path ne {} } {
     set n $prefix.$n
-  }
-  
+   }
   if { ![regexp $prefix {[ve]}] } {
     set n @$n
   }
@@ -135,7 +134,6 @@ proc ngspice::get_current {n} {
 proc ngspice::get_voltage {n} {
   set n [string tolower $n]
   set path [string range [xschem get sch_path] 1 end]
-
   set n v($path$n)
   set err [catch {set ::ngspice::ngspice_data($n)} res]
   if { $err } {
@@ -149,12 +147,11 @@ proc ngspice::get_voltage {n} {
 
 proc ngspice::get_node {n} {
   set n [string tolower $n]
-  if { [regexp -all \\. $n] == 1} {
-    regsub {@.\.} $n {@} n
-  }
+  set path [string range [xschem get sch_path] 1 end]
+  # puts "ngspice::get_node  --> $n,  path=$path"
+  set n [ subst -nocommand $n ]
   set err [catch {set ::ngspice::ngspice_data($n)} res]
   if { $err } { 
-    # puts "get_ngspice_node: $res"
     set res {?}
   } else {
     set res [ format %.4g $res ]
diff --git a/xschem_library/examples/mos_power_ampli.sch b/xschem_library/examples/mos_power_ampli.sch
index b2f0800d..9642c6c5 100644
--- a/xschem_library/examples/mos_power_ampli.sch
+++ b/xschem_library/examples/mos_power_ampli.sch
@@ -282,7 +282,7 @@ C {ngspice_get_expr.sym} 330 -900 0 1 {name=r17
 node="[ngspice::get_current v2]" 
 descr = current
 }
-C {ngspice_get_expr.sym} 350 -1040 0 0 {name=r18 
+C {ngspice_get_expr.sym} 360 -1040 0 0 {name=r18 
 node="[ngspice::get_current \{r2[i]\}]"
 descr = current
 }
@@ -359,7 +359,7 @@ C {ngspice_get_expr.sym} 1090 -530 0 1 {name=r25
 node="[ngspice::get_current vd]" 
 descr = current
 }
-C {ngspice_get_expr.sym} 1210 -1150 0 1 {name=r5 
+C {ngspice_get_expr.sym} 1210 -1140 0 1 {name=r5 
 node="[ngspice::get_current \{d0[id]\}]"
 descr = current
 }
@@ -417,6 +417,7 @@ C {spice_probe.sym} 1020 -1120 0 0 {name=p62  voltage=49.04}
 C {launcher.sym} 770 -110 0 0 {name=h1
 descr=Backannotate
 tclcommand="ngspice::annotate"}
-C {launcher.sym} 770 -160 0 0 {name=h4
-descr="View raw file"
-tclcommand="textwindow $netlist_dir/poweramp.raw"}
+C {launcher.sym} 770 -150 0 0 {name=h4
+descr="View Raw file" 
+tclcommand="textwindow $netlist_dir/[file tail [file rootname [ xschem get schname 0 ] ] ].raw"
+}
diff --git a/xschem_library/examples/poweramp.sch b/xschem_library/examples/poweramp.sch
index bb70b1e9..68bad97a 100644
--- a/xschem_library/examples/poweramp.sch
+++ b/xschem_library/examples/poweramp.sch
@@ -23,26 +23,40 @@ T {actual value
 T {actual value
 50u} 80 -290 0 0 0.4 0.4 {}
 T {actual value
-200} 870 -1330 0 0 0.4 0.4 {}
-N 160 -1250 160 -1230 {lab=#net1}
-N 160 -1110 160 -1090 {lab=#net2}
-N 370 -1170 380 -1170 {lab=VSS}
+200} 860 -1280 0 0 0.4 0.4 {}
+T {Different type of annotators.} 740 -960 0 0 0.4 0.4 {}
+T {In this annotator (push method) 
+the annotated value is "pushed"
+into it as an attribute by the
+tcl annotate script. This attribute
+is persistent and may be saved to file.} 780 -920 0 0 0.2 0.2 {layer=4}
+T {This annotator uses a "pull"
+method, calling a tcl procedure 
+to return the operating point data.
+This information is not persistent,
+however when used in multiple instances
+each with different bias points these
+annotator dinamically show the correct 
+data.} 780 -830 0 0 0.2 0.2 {layer=4}
+N 150 -1220 150 -1200 {lab=#net1}
+N 150 -1080 150 -1060 {lab=#net2}
+N 360 -1140 370 -1140 {lab=VSS}
 N 710 -700 860 -700 {lab=OUTM}
-N 510 -1200 580 -1200 {lab=VSS}
-N 580 -1200 580 -1190 {lab=VSS}
-N 580 -1190 620 -1190 {lab=VSS}
-N 550 -1240 580 -1240 {lab=IN}
-N 620 -1250 710 -1250 {lab=REFP}
-N 270 -1100 270 -1090 {lab=#net3}
-N 270 -1170 270 -1160 {lab=#net4}
-N 160 -1090 190 -1090 {lab=#net2}
-N 370 -1090 380 -1090 {lab=VNN}
-N 160 -1250 190 -1250 {lab=#net1}
-N 370 -1250 380 -1250 {lab=VPP}
-N 270 -1170 280 -1170 {lab=#net4}
-N 250 -1250 280 -1250 {lab=#net5}
-N 250 -1090 270 -1090 {lab=#net3}
-N 160 -1170 270 -1170 {lab=#net4}
+N 500 -1150 570 -1150 {lab=VSS}
+N 570 -1150 570 -1140 {lab=VSS}
+N 570 -1140 610 -1140 {lab=VSS}
+N 540 -1190 570 -1190 {lab=IN}
+N 610 -1200 700 -1200 {lab=REFP}
+N 260 -1070 260 -1060 {lab=#net3}
+N 260 -1140 260 -1130 {lab=#net4}
+N 150 -1060 180 -1060 {lab=#net2}
+N 360 -1060 370 -1060 {lab=VNN}
+N 150 -1220 180 -1220 {lab=#net1}
+N 360 -1220 370 -1220 {lab=VPP}
+N 260 -1140 270 -1140 {lab=#net4}
+N 240 -1220 270 -1220 {lab=#net5}
+N 240 -1060 260 -1060 {lab=#net3}
+N 150 -1140 260 -1140 {lab=#net4}
 N 550 -950 710 -950 {lab=OUTM}
 N 400 -890 550 -890 {lab=FBN}
 N 550 -770 550 -750 {lab=IN}
@@ -57,9 +71,9 @@ N 710 -490 710 -240 {lab=OUTP}
 N 240 -400 240 -380 {lab=VPP}
 N 260 -220 260 -190 {lab=INX}
 N 260 -130 260 -110 {lab=VSS}
-N 510 -1120 580 -1120 {lab=VSS}
-N 550 -1160 580 -1160 {lab=IN}
-N 620 -1170 710 -1170 {lab=REFM}
+N 500 -1070 570 -1070 {lab=VSS}
+N 540 -1110 570 -1110 {lab=IN}
+N 610 -1120 700 -1120 {lab=REFM}
 N 200 -220 240 -220 {lab=INX}
 N 550 -310 550 -290 {lab=VSS}
 N 650 -700 710 -700 {lab=OUTM}
@@ -71,21 +85,21 @@ N 260 -680 260 -650 {lab=VSSX}
 N 260 -590 260 -570 {lab=VSS}
 N 240 -680 260 -680 {lab=VSSX}
 N 180 -680 240 -680 {lab=VSSX}
-N 880 -1250 900 -1250 {lab=IN_INT}
-N 880 -1250 880 -1220 {lab=IN_INT}
+N 870 -1200 890 -1200 {lab=IN_INT}
+N 870 -1200 870 -1170 {lab=IN_INT}
 N 400 -1000 400 -980 {lab=VPP}
 N 400 -540 400 -520 {lab=VPP}
 N 860 -700 860 -520 {lab=OUTM}
 N 860 -460 860 -240 {lab=OUTP}
 N 350 -890 400 -890 {lab=FBN}
 N 350 -430 400 -430 {lab=FB}
-N 580 -1110 620 -1110 {lab=VSS}
-N 580 -1120 580 -1110 {lab=VSS}
-N 280 -1250 310 -1250 {lab=#net5}
-N 270 -1090 310 -1090 {lab=#net3}
-N 280 -1170 310 -1170 {lab=#net4}
-N 280 -1180 280 -1170 { lab=#net4}
-N 280 -1250 280 -1240 { lab=#net5}
+N 570 -1060 610 -1060 {lab=VSS}
+N 570 -1070 570 -1060 {lab=VSS}
+N 270 -1220 300 -1220 {lab=#net5}
+N 260 -1060 300 -1060 {lab=#net3}
+N 270 -1140 300 -1140 {lab=#net4}
+N 270 -1150 270 -1140 { lab=#net4}
+N 270 -1220 270 -1210 { lab=#net5}
 N 240 -730 240 -680 { lab=VSSX}
 N 240 -270 240 -220 { lab=INX}
 N 400 -920 400 -910 { lab=FBN}
@@ -116,30 +130,30 @@ vvss vss 0 dc 0
 .include \\"models_poweramp.txt\\"
 .control
 save all
+op
+write poweramp.raw
 tran  6e-7 0.06 uic
 * .FOUR 20k v(outm,outp)
 * .probe i(*) 
 plot outp outm
 save all
 save p(r*) p(v*)
-op
-write poweramp.raw
 .endc
 "}
-C {vsource.sym} 160 -1200 0 0 {name=V1 value="dc 50 pwl 0 0 1m 50"}
-C {vsource.sym} 160 -1140 0 0 {name=V0 value="dc 50 pwl 0 0 1m 50"}
-C {lab_pin.sym} 380 -1250 0 1 {name=p5 lab=VPP}
-C {lab_pin.sym} 380 -1090 0 1 {name=p6 lab=VNN}
-C {lab_pin.sym} 380 -1170 0 1 {name=p3 lab=VSS}
+C {vsource.sym} 150 -1170 0 0 {name=V1 value="dc 50 pwl 0 0 1m 50"}
+C {vsource.sym} 150 -1110 0 0 {name=V0 value="dc 50 pwl 0 0 1m 50"}
+C {lab_pin.sym} 370 -1220 0 1 {name=p5 lab=VPP}
+C {lab_pin.sym} 370 -1060 0 1 {name=p6 lab=VNN}
+C {lab_pin.sym} 370 -1140 0 1 {name=p3 lab=VSS}
 C {lab_pin.sym} 860 -240 0 1 {name=p14 lab=OUTP}
 C {res.sym} 860 -490 0 1 {name=R1 m=1 value=8}
-C {lab_pin.sym} 510 -1200 0 0 {name=p26 lab=VSS}
-C {lab_pin.sym} 550 -1240 0 0 {name=p31 lab=IN}
-C {vcvs.sym} 620 -1220 0 0 {name=E3 value='gain*0.99'}
-C {lab_pin.sym} 710 -1250 0 1 {name=p32 lab=REFP}
-C {capa.sym} 270 -1130 0 0 {name=C3 m=1 value="100u"}
-C {res.sym} 220 -1250 1 1 {name=R11 m=1 value=0.3}
-C {res.sym} 220 -1090 1 1 {name=R9 m=1 value=0.3}
+C {lab_pin.sym} 500 -1150 0 0 {name=p26 lab=VSS}
+C {lab_pin.sym} 540 -1190 0 0 {name=p31 lab=IN}
+C {vcvs.sym} 610 -1170 0 0 {name=E3 value='gain*0.99'}
+C {lab_pin.sym} 700 -1200 0 1 {name=p32 lab=REFP}
+C {capa.sym} 260 -1100 0 0 {name=C3 m=1 value="100u"}
+C {res.sym} 210 -1220 1 1 {name=R11 m=1 value=0.3}
+C {res.sym} 210 -1060 1 1 {name=R9 m=1 value=0.3}
 C {res.sym} 550 -920 0 1 {name=R19 m=1 value='100k'}
 C {res.sym} 550 -860 0 1 {name=R0 m=1 value="'100k/gain'"}
 C {lab_pin.sym} 550 -750 0 0 {name=p108 lab=IN}
@@ -154,13 +168,13 @@ C {res.sym} 240 -350 0 1 {name=R6 m=1 value=100k}
 C {lab_pin.sym} 240 -400 0 0 {name=p7 lab=VPP}
 C {res.sym} 260 -160 0 1 {name=R7 m=1 value=100k}
 C {lab_pin.sym} 260 -110 0 0 {name=p15 lab=VSS}
-C {lab_pin.sym} 510 -1120 0 0 {name=p20 lab=VSS}
-C {lab_pin.sym} 550 -1160 0 0 {name=p21 lab=IN}
-C {vcvs.sym} 620 -1140 0 0 {name=E0 value='-gain*0.99'}
-C {lab_pin.sym} 710 -1170 0 1 {name=p23 lab=REFM}
+C {lab_pin.sym} 500 -1070 0 0 {name=p20 lab=VSS}
+C {lab_pin.sym} 540 -1110 0 0 {name=p21 lab=IN}
+C {vcvs.sym} 610 -1090 0 0 {name=E0 value='-gain*0.99'}
+C {lab_pin.sym} 700 -1120 0 1 {name=p23 lab=REFM}
 C {lab_pin.sym} 240 -250 0 0 {name=p8 lab=INX}
-C {lab_pin.sym} 880 -1100 0 0 {name=p126 lab=VSS}
-C {lab_pin.sym} 960 -1250 0 1 {name=p127 lab=IN}
+C {lab_pin.sym} 870 -1050 0 0 {name=p126 lab=VSS}
+C {lab_pin.sym} 950 -1200 0 1 {name=p127 lab=IN}
 C {capa.sym} 550 -800 0 0 {name=C5 m=1 value="100n ic=0"}
 C {lab_pin.sym} 550 -290 0 0 {name=p11 lab=VSS}
 C {capa.sym} 550 -340 0 0 {name=C6 m=1 value="100n ic=0"}
@@ -168,7 +182,7 @@ C {lab_pin.sym} 350 -200 0 0 {name=p28 lab=VSS}
 C {lab_pin.sym} 350 -660 0 0 {name=p1 lab=VSS}
 C {res.sym} 550 -460 0 1 {name=R2 m=1 value='100k'}
 C {res.sym} 550 -400 0 1 {name=R3 m=1 value="'100k/(gain-2)'"}
-C {vsource.sym} 880 -1190 0 0 {name=V3 
+C {vsource.sym} 870 -1140 0 0 {name=V3 
 xvalue="dc 0 pulse -.1 .1 1m .1u .1u 10.1u 20u" 
 value="dc 0 sin 0 1 frequ 1m"
 }
@@ -182,19 +196,19 @@ C {lab_pin.sym} 140 -220 0 0 {name=p0 lab=IN}
 C {capa.sym} 150 -680 1 0 {name=C1 m=1 value="100n ic=0"}
 C {lab_pin.sym} 120 -680 0 0 {name=p17 lab=VSS}
 C {lab_pin.sym} 240 -710 0 0 {name=p22 lab=VSSX}
-C {res.sym} 930 -1250 1 1 {name=R10 m=1 value=2}
+C {res.sym} 920 -1200 1 1 {name=R10 m=1 value=2}
 C {lab_pin.sym} 400 -1000 0 0 {name=p24 lab=VPP}
 C {res.sym} 400 -490 0 1 {name=R13 m=1 value=100k}
 C {lab_pin.sym} 400 -540 0 0 {name=p16 lab=VPP}
-C {vsource.sym} 880 -1130 0 0 {name=Vin value=0 xvalue="pwl 0 .1 1m .1 1.01m 0"
+C {vsource.sym} 870 -1080 0 0 {name=Vin value=0 xvalue="pwl 0 .1 1m .1 1.01m 0"
 }
 C {lab_pin.sym} 350 -270 0 0 {name=p19 lab=FB}
 C {lab_pin.sym} 350 -730 0 0 {name=p25 lab=FBN}
 C {title.sym} 160 -30 0 0 {name=l2 author="Stefan Schippers"}
-C {lab_pin.sym} 880 -1250 0 0 {name=p27 lab=IN_INT}
-C {ammeter.sym} 340 -1250 3 0 {name=vcurrvpp  net_name=true       current=0.54}
-C {ammeter.sym} 340 -1090 3 0 {name=vcurrvnn  net_name=true       current=-0.4526}
-C {ammeter.sym} 340 -1170 3 0 {name=vcurrvss  net_name=true       current=-0.08742}
+C {lab_pin.sym} 870 -1200 0 0 {name=p27 lab=IN_INT}
+C {ammeter.sym} 330 -1220 3 0 {name=vcurrvpp  net_name=true       current=0.54}
+C {ammeter.sym} 330 -1060 3 0 {name=vcurrvnn  net_name=true       current=-0.4526}
+C {ammeter.sym} 330 -1140 3 0 {name=vcurrvss  net_name=true       current=-0.08742}
 C {launcher.sym} 780 -120 0 0 {name=h2
 descr="Ctrl-Click
 Clear all probes" 
@@ -222,12 +236,12 @@ tclcommand="
 "
 }
 C {ngspice_probe.sym} 350 -810 0 1 {name=p55}
-C {ngspice_probe.sym} 240 -1170 0 1 {name=p34}
-C {capa.sym} 280 -1210 0 0 {name=C2 m=1 value="100u"}
-C {ngspice_probe.sym} 160 -1250 0 1 {name=p35}
-C {ngspice_probe.sym} 160 -1090 0 1 {name=p36}
-C {ngspice_probe.sym} 380 -1170 0 0 {name=p37}
-C {ngspice_probe.sym} 810 -700 0 1 {name=p29}
+C {ngspice_probe.sym} 230 -1140 0 1 {name=p34}
+C {capa.sym} 270 -1180 0 0 {name=C2 m=1 value="100u"}
+C {ngspice_probe.sym} 150 -1220 0 1 {name=p35}
+C {ngspice_probe.sym} 150 -1060 0 1 {name=p36}
+C {ngspice_probe.sym} 370 -1140 0 0 {name=p37}
+C {ngspice_probe.sym} 840 -700 0 1 {name=p29}
 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}
@@ -258,18 +272,19 @@ load $netlist_dir/$rawfile
 table_set $rawfile\\"
 unset rawfile"
 }
-C {spice_probe.sym} 730 -700 0 0 {name=p40 analysis=tran voltage=-0.1364}
-C {spice_probe.sym} 740 -240 0 0 {name=p41 analysis=tran voltage=-0.1364}
-C {spice_probe.sym} 670 -1250 0 0 {name=p42 analysis=tran voltage=0.0000e+00}
-C {spice_probe.sym} 680 -1170 0 0 {name=p43 analysis=tran voltage=0.0000e+00}
-C {spice_probe.sym} 960 -1250 0 0 {name=p44 analysis=tran voltage=0.0000e+00}
+C {spice_probe.sym} 710 -860 0 0 {name=p40 analysis=tran voltage=-0.1364}
+C {spice_probe.sym} 710 -400 0 0 {name=p41 analysis=tran voltage=-0.1364}
+C {spice_probe.sym} 660 -1200 0 0 {name=p42 analysis=tran voltage=0.0000e+00}
+C {spice_probe.sym} 670 -1120 0 0 {name=p43 analysis=tran voltage=0.0000e+00}
+C {spice_probe.sym} 950 -1200 0 0 {name=p44 analysis=tran voltage=0.0000e+00}
 C {launcher.sym} 1000 -270 0 0 {name=h1
 descr=Backannotate
 tclcommand="ngspice::annotate"}
-C {launcher.sym} 1000 -320 0 0 {name=h4
-descr="View raw file"
-tclcommand="textwindow $netlist_dir/poweramp.raw"}
-C {ngspice_get_expr.sym} 220 -1040 0 0 {name=r19 
+C {ngspice_get_expr.sym} 210 -1010 0 0 {name=r19 
 node="[ngspice::get_current \{r9[i]\}]"
 descr = current
 }
+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"
+}