diff --git a/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java b/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
index 09438c8..ae37c72 100644
--- a/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
+++ b/src/com/bytezone/diskbrowser/applefile/ApplesoftBasicProgram.java
@@ -15,8 +15,11 @@ import com.bytezone.diskbrowser.utilities.Utility;
 public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftConstants
 // -----------------------------------------------------------------------------------//
 {
-  static final String underline = "----------------------------------------------------"
-      + "----------------------------------------------";
+  private static final String underline =
+      "----------------------------------------------------"
+          + "----------------------------------------------";
+  private static Pattern dimPattern =
+      Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9,]*\\)[,:]?");
 
   private final List<SourceLine> sourceLines = new ArrayList<> ();
   private final int endPtr;
@@ -40,6 +43,7 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
   String formatLeft;
   String formatLineNumber;
   String formatRight;
+  String formatCall;
   int maxDigits;
 
   // ---------------------------------------------------------------------------------//
@@ -87,6 +91,7 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
     formatLeft = longestVarName > 7 ? "%-" + longestVarName + "." + longestVarName + "s  "
         : "%-7.7s  ";
     formatRight = formatLeft.replace ("-", "");
+    formatCall = longestVarName > 7 ? "%-" + longestVarName + "s  " : "%-7s  ";
 
     maxDigits = getMaxDigits ();
     formatLineNumber = "%" + maxDigits + "d ";
@@ -349,13 +354,6 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
       fullText.append ("\n");
     }
 
-    //    if (basicPreferences.showAllXref)
-    //      addXref (fullText);
-    //
-    //    if (fullText.length () > 0)
-    //      while (fullText.charAt (fullText.length () - 1) == '\n')
-    //        fullText.deleteCharAt (fullText.length () - 1);     // remove trailing newlines
-
     return fullText;
   }
 
@@ -465,7 +463,13 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
     heading (fullText, formatLeft, heading);
 
     for (String symbol : map.keySet ())                   // left-justify strings
-      appendLineNumbers (fullText, String.format (formatLeft, symbol), map.get (symbol));
+    {
+      if (symbol.length () <= 7)
+        appendLineNumbers (fullText, String.format (formatLeft, symbol),
+            map.get (symbol));
+      else
+        appendLineNumbers (fullText, symbol + " ", map.get (symbol));
+    }
   }
 
   // ---------------------------------------------------------------------------------//
@@ -621,19 +625,29 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
     int firstSpace = 0;
     while (firstSpace < line.length () && line.charAt (firstSpace) != ' ')
       ++firstSpace;
+    String indent = "        ".substring (0, firstSpace + 1);
 
     List<String> lines = new ArrayList<> ();
     while (line.length () > wrapLength)
     {
-      int max = Math.min (wrapLength, line.length () - 1);
-      while (max > 0 && line.charAt (max) != breakChar)
-        --max;
-      if (max == 0)
+      int breakAt = wrapLength;
+      while (breakAt > firstSpace && line.charAt (breakAt) != breakChar)
+        --breakAt;
+
+      if (breakAt <= firstSpace)
         break;
-      lines.add (line.substring (0, max + 1));
-      line = "       ".substring (0, firstSpace + 1) + line.substring (max + 1);
+
+      lines.add (line.substring (0, breakAt + 1));      // keep breakChar at end
+      line = indent + line.substring (breakAt + 1);
     }
 
+    if (lines.size () == 0)                             // no breaks
+      while (line.length () > wrapLength)
+      {
+        lines.add (line.substring (0, wrapLength));
+        line = indent + line.substring (wrapLength);
+      }
+
     lines.add (line);
     return lines;
   }
@@ -644,8 +658,7 @@ public class ApplesoftBasicProgram extends BasicProgram implements ApplesoftCons
   {
     List<String> lines = new ArrayList<> ();
 
-    Pattern p = Pattern.compile ("[A-Z][A-Z0-9]*[$%]?\\([0-9,]*\\)[,:]?");
-    Matcher m = p.matcher (line);
+    Matcher m = dimPattern.matcher (line);
 
     while (m.find ())
       lines.add ("    " + m.group ());
diff --git a/src/com/bytezone/diskbrowser/applefile/SubLine.java b/src/com/bytezone/diskbrowser/applefile/SubLine.java
index 5d9702b..90b70f0 100644
--- a/src/com/bytezone/diskbrowser/applefile/SubLine.java
+++ b/src/com/bytezone/diskbrowser/applefile/SubLine.java
@@ -98,8 +98,16 @@ public class SubLine implements ApplesoftConstants
       if (inQuote && b != Utility.ASCII_QUOTE)      // ignore strings
         continue;
 
-      if (Utility.isPossibleVariable (b))           // A-Z 0-9
+      if (Utility.isPossibleVariable (b))           // A-Z 0-9 $ %
+      {
         var += (char) b;
+        if ((b == Utility.ASCII_DOLLAR || b == Utility.ASCII_PERCENT)   // var name end
+            && buffer[ptr] != Utility.ASCII_LEFT_BRACKET)               // not an array
+        {
+          checkVar (var, b);
+          var = "";
+        }
+      }
       else
       {
         if (inFunction)
@@ -285,16 +293,11 @@ public class SubLine implements ApplesoftConstants
         break;
 
       case TOKEN_CALL:
-        byte[] lineBuffer = getBuffer ();
-
-        if (lineBuffer[0] == TOKEN_MINUS)
-          callTarget = "-" + new String (lineBuffer, 1, lineBuffer.length - 1);
-        else
-          callTarget = new String (lineBuffer, 0, lineBuffer.length);
+        callTarget = getExpression ();
         break;
 
       case TOKEN_DEF:
-        lineBuffer = getBuffer ();
+        byte[] lineBuffer = getBuffer ();
         assert lineBuffer[0] == TOKEN_FN;
 
         int leftBracket = getPosition (lineBuffer, 1, Utility.ASCII_LEFT_BRACKET);
@@ -310,6 +313,26 @@ public class SubLine implements ApplesoftConstants
     }
   }
 
+  // ---------------------------------------------------------------------------------//
+  private String getExpression ()
+  // ---------------------------------------------------------------------------------//
+  {
+    StringBuilder text = new StringBuilder ();
+
+    int ptr = startPtr + 1;
+    int max = startPtr + length - 1;
+    while (ptr < max)
+    {
+      if (Utility.isHighBitSet (buffer[ptr]))
+        text.append (tokens[buffer[ptr] & 0x7F]);
+      else
+        text.append ((char) buffer[ptr]);
+      ++ptr;
+    }
+
+    return text.toString ();
+  }
+
   // ---------------------------------------------------------------------------------//
   private int getPosition (byte[] buffer, int start, byte value)
   // ---------------------------------------------------------------------------------//