diff --git a/src/hilight.c b/src/hilight.c
index cc6fd861..2f732173 100644
--- a/src/hilight.c
+++ b/src/hilight.c
@@ -923,12 +923,7 @@ static void send_net_to_graph(char **s, int simtype, const char *node)
         my_snprintf(ss, S(ss), "%s%s %d ", strtolower(p), strtolower(t), c);
         my_strcat(1502, s, ss);
       } else { /* Xyce */
-        char *pp=p;
-        while(*pp){
-          if(*pp == '.') *pp = ':'; /* Xyce uses : as path separator */
-          pp++;
-        }
-        my_snprintf(ss, S(ss), "%s%s %d", strtoupper(p), strtoupper(t), c);
+        my_snprintf(ss, S(ss), "%s%s %d", strtolower(p), strtolower(t), c);
         my_strcat(536, s, ss);
       }
 
@@ -1065,13 +1060,8 @@ static void send_current_to_graph(char **s, int simtype, const char *node)
                   strtolower(p), strtolower(t), c);
       my_strcat(537, s, ss);
     } else { /* Xyce */
-      char *pp=p;
-      while(*pp){
-        if(*pp == '.') *pp = ':'; /* Xyce uses : as path separator */
-        pp++;
-      }
-      my_snprintf(ss, S(ss), "%s%s%s#branch %d", xctx->currsch>0 ? "V:" : "",
-                  strtoupper(p), strtoupper(xctx->currsch>0 ? t+1 : t ), c);
+      my_snprintf(ss, S(ss), "%s%s%s#branch %d", xctx->currsch>0 ? "v." : "",
+                  strtolower(p), strtolower(xctx->currsch>0 ? t+1 : t ), c);
       my_strcat(535, s, ss);
     }
   }
diff --git a/src/save.c b/src/save.c
index c006b639..98b9e237 100644
--- a/src/save.c
+++ b/src/save.c
@@ -301,8 +301,10 @@ static int read_dataset(FILE *fd)
   char line[PATH_MAX], varname[PATH_MAX];
   char *ptr;
   int n = 0, done_header = 0;
-  int exit_status = 0;
+  int simtype, exit_status = 0;
   xctx->graph_sim_type = 0;
+  tcleval("sim_is_xyce");
+  simtype = atoi( tclresult() );
   
   while((ptr = fgets(line, sizeof(line), fd)) ) {
     /* after this line comes the binary blob made of nvars * npoints * sizeof(double) bytes */
@@ -397,11 +399,18 @@ static int read_dataset(FILE *fd)
         dbg(0, "read_dataset(): WAARNING: malformed raw file, aborting\n");
         return 1;
       }
+      strtolower(varname);
+      if(simtype) { /* Xyce uses : as path separator */
+        char *ptr = varname;
+        while(*ptr) {
+          if(*ptr == ':') *ptr = '.';
+          ptr++;
+        }
+      }
       if(xctx->graph_sim_type == 3) { /* AC */
         my_strcat(415, &xctx->graph_names[i << 1], varname);
         int_hash_lookup(xctx->graph_raw_table, xctx->graph_names[i << 1], (i << 1), XINSERT_NOREPLACE);
-        if(strstr(varname, "v(") == varname || strstr(varname, "i(") == varname ||
-           strstr(varname, "V(") == varname || strstr(varname, "I(") == varname)
+        if(strstr(varname, "v(") == varname || strstr(varname, "i(") == varname)
           my_mstrcat(664, &xctx->graph_names[(i << 1) + 1], "ph(", varname + 2, NULL);
         else
           my_mstrcat(540, &xctx->graph_names[(i << 1) + 1], "ph(", varname, ")", NULL);
@@ -538,51 +547,19 @@ int read_rawfile(const char *f)
 /* given a node XXyy try XXyy , xxyy, XXYY, v(XXyy), v(xxyy), V(XXYY) */
 int get_raw_index(const char *node)
 {
-  int simtype;
   char inode[512];
   char vnode[512];
-  char lnode[512];
-  char unode[512];
   Int_hashentry *entry;
 
 
   dbg(1, "get_raw_index(): node=%s\n", node);
   if(xctx->graph_values) {
-    tcleval("sim_is_xyce");
-    simtype = atoi( tclresult() );
-    my_strncpy(inode, node, S(lnode));
-  
-    if(simtype) { /* Xyce */
-      char *ptr = inode;
-      while(*ptr) {
-        if(*ptr == '.') *ptr = ':';
-        ptr++;
-      }
-    }
+    my_strncpy(inode, node, S(inode));
+    strtolower(inode);
     entry = int_hash_lookup(xctx->graph_raw_table, inode, 0, XLOOKUP);
     if(!entry) {
-      my_strncpy(lnode, inode, S(lnode));
-      strtolower(lnode);
-      entry = int_hash_lookup(xctx->graph_raw_table, lnode, 0, XLOOKUP);
-      if(!entry) {
-        my_strncpy(unode, inode, S(lnode));
-        strtoupper(lnode);
-        entry = int_hash_lookup(xctx->graph_raw_table, lnode, 0, XLOOKUP);
-        if(!entry) {
-          my_snprintf(vnode, S(vnode), "v(%s)", inode);
-          entry = int_hash_lookup(xctx->graph_raw_table, vnode, 0, XLOOKUP);
-          if(!entry) {
-            my_strncpy(lnode, vnode, S(lnode));
-            strtolower(lnode);
-            entry = int_hash_lookup(xctx->graph_raw_table, lnode, 0, XLOOKUP);
-            if(!entry) {
-              my_strncpy(unode, vnode, S(lnode));
-              strtoupper(lnode);
-              entry = int_hash_lookup(xctx->graph_raw_table, lnode, 0, XLOOKUP);
-            }
-          }
-        }
-      }
+      my_snprintf(vnode, S(vnode), "v(%s)", inode);
+      entry = int_hash_lookup(xctx->graph_raw_table, vnode, 0, XLOOKUP);
     }
     if(entry) return entry->value;
   }
diff --git a/src/scheduler.c b/src/scheduler.c
index 9f3a8e22..3d96972f 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -2156,8 +2156,8 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
           Tcl_SetResult(interp, my_itoa(xctx->graph_nvars), TCL_VOLATILE);
         } else if(argc > 2 && !strcmp(argv[2], "list")) {
           for(i = 0 ; i < xctx->graph_nvars; i++) {
-            if(i > 0) Tcl_SetResult(interp, "\n", TCL_VOLATILE);
-            Tcl_SetResult(interp, xctx->graph_names[i], TCL_VOLATILE);
+            if(i > 0) Tcl_AppendResult(interp, "\n", NULL);
+            Tcl_AppendResult(interp, xctx->graph_names[i], NULL);
           }
         }
       }
diff --git a/src/xschem.tcl b/src/xschem.tcl
index 2dda643d..d3c5f9de 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -737,7 +737,7 @@ proc set_sim_defaults {{reset {}}} {
     set_ne sim(spice,1,fg) 0
     set_ne sim(spice,1,st) 1
     
-    set_ne sim(spice,2,cmd) {Xyce "$N"}
+    set_ne sim(spice,2,cmd) "Xyce \"\$N\"\n# Add -r \"\$n.raw\" if you want all variables saved"
     set sim(spice,2,name) {Xyce batch}
     set_ne sim(spice,2,fg) 0
     set_ne sim(spice,2,st) 1