diff --git a/software/BALGOL/BALGOL-Main.baca b/software/BALGOL/BALGOL-Main.baca
index 50015d8..ec0e6eb 100644
--- a/software/BALGOL/BALGOL-Main.baca
+++ b/software/BALGOL/BALGOL-Main.baca
@@ -1,5 +1,5 @@
-                    ASMBL 1
-                    REORD 1.00
+                          ASMBL 1
+                          REORD 1.00
 
                                               THE BURROUGHS ALGEBRAIC COMPILER
                                           ERDWINN, MERNER, CROWDER, SPERONI, KNUTH
@@ -36,7 +36,7 @@
     43 0     0019         BRP   A-
     44 0     0020         BUN   46
     45 0     0021   *E    CNST  $$CHECK SUM ERROR$$
-    46 0     0022         LOCN  46
+    46 0     0025         LOCN  46
     47 0     0046   *D    LDB   Z+         READ LAST BLOCK INTO THE
     48 0     0047         MNC 5 0,T,2         END OF MEMORY
     49 0     0048         LDB   *+1        (THIS HOLDS PATCHES AND
@@ -277,7 +277,7 @@
  02 84 0     0279   FV    F424  FV,0,0        FOR VARIABLE
  02 85 0     0280   MULS  F424  MULS,0,0      DIMENSIONS
 002 86 0     0281   MODE  F424  MODE,0,NRMMD  MODE TRANSLATOR IS IN (INITIALLY NORMAL)
- 02 87 0     0282   MULS  F424  MULT,0,0      MULS STACK BACKWARDS
+ 02 87 0     0282   MULT  F424  MULT,0,0      MULS STACK BACKWARDS
  02 88 0     0283   OPRND F424  OPRND,0,0     OPERANDS WAITING TO BE USED
  02 89 0     0284   PAREF F424  PAREF,0,0     REFERENCE TO PROCEDURE PARAMETERS
  02 90 0     0285   PR1   F424  PR3,0,0       PREFIXES OUTSIDE OF PROCEDURES
@@ -315,13 +315,13 @@
  03 22 0     0314   SOLD  F2440 11,0024,1     21 / DIVISION
  03 23 0     0315   CRP   F2443 00,GCRP,1     22 PROCEDURE
  03 24 0     0316   KOMA  F2446 00,COMMA,5    23 , COMMA
- 03 25 0     0317   LAPR  F2440 00,0000,2     24 ( LEFT PARENTHESIS
+ 03 25 0     0317   LPAR  F2440 00,0000,2     24 ( LEFT PARENTHESIS
  03 26 0     0318   CRQ   F2443 00,GCRQ,1     25 PROCEDURE
  03 27 0     0319   CRR   F2441 40,GCRR,1     26 ARRAY
  03 28 0     0320   CRS   F2443 00,GCRS,1     27 SUBROUTINE
  03 29 0     0321   CRT   F2442 00,GCRT,1     28 GO TO
  03 30 0     0322   CRU   F2442 00,GCRU,1     29 UNTIL
- 03 31 0     0323   CRV   F2443 00,FCRV,1     30 SEGMENT
+ 03 31 0     0323   CRV   F2443 00,GCRV,1     30 SEGMENT
  03 32 0     0324   CRW   F2443 00,GCRW,1     31 OTHERWISE
  03 33 0     0325   CRX   F2443 00,GCRX,1     32 FOR
  03 34 0     0326   SBST  F2446 00,EQUL,5     33 = ASSIGNMENT
@@ -330,7 +330,7 @@
  03 37 0     0329   TEMP3 CNST  0                NOT USED
  03 38 0     0330   BREF  F2445 00,0000,1     37 BACKWARD REFERENCE
  03 39 0     0331   TOP   CNST  0                NOT USED
- 03 40 0     0332   CWNED F2446 00,END,1      39 END
+ 03 40 0     0332   CWEND F2446 00,END,1      39 END
  03 41 0     0333   CWNDX F2446 00,NDXMD,4    40 ARRAY CALL
  03 42 0     0334   CWARD F2446 00,ARDEC,1    41 ARRAY DECLARATION
  03 43 0     0335   CWEMP F2446 00,EMPTY,5    42 EMPTY SUBSCRIPT
@@ -343,11 +343,11 @@
  03 50 0     0342   RLEQ  F2448 01,0012,1     49 LEQ
  03 51 0     0343   OPMAX F2440 00,0100,1     50 MAX
  03 52 0     0344   OPMIN F2440 00,0112,1     51 MIN
- 03 53 0     0345   CROY  F2443 22,GCROW,1    52 TRACE
+ 03 53 0     0345   CROY  F2443 22,GCROY,1    52 TRACE
 
                                               VARIOUS MODES
  03 56 0     0346   ARAMD F244  0,ARACM,ARRAY ARRAY DECLARATION MODE
- 03 57 0     0347   ARFMD F244  0,ARFCM,ARFGM ARRAY-FILL MODE
+ 03 57 0     0347   ARFMD F244  0,ARFCM,ARFCM ARRAY-FILL MODE
  03 58 0     0348   DCLMD DEFN  *             TYPE DECLARATION MODES
  03 59 0     0348   INTMD F244  0,DCLCM,INTG  INTEGER DECLARATION MODE
  03 60 0     0349   FLTMD F244  0,DCLCM,FLTG  FLOATING DECLARATION MODE
@@ -392,7 +392,7 @@
  03 99 0     0390   BOOGN F4246 7004,0,INTMD
  04 00 0     0391         CNST  $BOOLEAN$
  04 01 0     0393   COMGN F4246 7001,0,COMNT
- 04 02 0     3094         CNST  $COMMENT$
+ 04 02 0     0394         CNST  $COMMENT$
  04 03 0     0396   LEQGN F4248 7001,01,12
  04 04 0     0397         CNST  $LEQ$
  04 05 0     0398   FORMG F4246 7004,0,FRMMD
@@ -530,7 +530,7 @@
  05 37 0     0541         F4248 8888,30,R23           *N
  05 38 0     0542         F2441 10,FONE,TABSC+82      *) ILLEGAL
  05 39 0     0543         F4248 8888,30,R8            *(
- 05 40 0     0544   TOGN  F4246 7001,0,T0             *. ILLEGAL
+ 05 40 0     0544   TOGN  F4246 7001,0,TO             *. ILLEGAL
  05 41 0     0545         CNST  $TO$                  *$ ILLEGAL
  05 42 0     0546   BEGGN F4240 7002,0,0              *, ILLEGAL
  05 43 0     0547         CNST  $BEGIN$               ** ILLEGAL
@@ -854,7 +854,7 @@
  08 61 0     0847   SCN10 CAD   CWEMP
  08 62 0     0848   SCN5  STP   SCAN
  08 63 0     0849         BUN   EXCTR         GO TO EXECUTOR CO-ROUTINE.
- 08 64 0     0850   SCNI  LDR   S2
+ 08 64 0     0850   SCN1  LDR   S2
  08 65 0     0851         STR   S1            MOVE SCANNING WINDOWS TO RIGHT
  08 66 0     0852         LDR   K2             ACROSS SOURCE STRING
  08 67 0     0853         STR   K1
@@ -953,7 +953,7 @@
 009 60 0     0939         IFL - 0,11,5        THE PRESENT SYMBOL IS A PARAMETRIC ARRAY
 009 61 0     0940         STP   FRMEX         SEND ITS NAME AND AN ARRAY-PARAMETER
  09 62 0     0941         BUN   FRME           OPERATOR TO THE EXECUTOR
- 09 63 0     0942         CAD   VWAPM
+ 09 63 0     0942         CAD   CWAPM
  09 64 0     0943         BUN   SCN5
  09 65 0     0944   *A    IFL - 0,12,10
  09 66 0     0945         DLB   L,64,0        THE PRESENT SYMBOL IS THE NAME OF THE
@@ -973,7 +973,7 @@
 009 80 0     0959         STP   FRMEX          A PARAMETRIC FUNCTION OR PROCEDURE
  09 81 0     0960         BUN   FRME
  09 82 0     0961   *E    LDR   SC7           PASS CHARACTERS UNTIL MATCHING RIGHT
- 09 83 0     0962         BUN   PRNCT          PARENTHESIS IS FOUND AND GO TO SCN7
+ 09 83 0     0962         BUN   PRCNT          PARENTHESIS IS FOUND AND GO TO SCN7
  09 84 0     0963   *D    CFR   FUNMD,64
  09 85 0     0964         BCU   F+
 009 86 0     0965         BSA   F+,1          IF CALLING A FUNCTION,CHECK $ COUNT
@@ -1083,7 +1083,7 @@
 010 90 0     1067         LDR   *+1
 010 91 0     1068         LDB   PR3
 010 92 0     1069   *C    STR   TEMP2
-010 93 0     1070         STB   TEMPI
+010 93 0     1070         STB   TEMP1
 010 94 0     1071         IBB   B+,9999
 010 95 0     1072         LDR - 1
 010 96 0     1073         STR   TEMP
@@ -1120,7 +1120,7 @@
 
 
 011 29 0     1099   R6    STP   WINDX         N) N$ N, NP
-011 30 0     1100         BUN   WINDI,R3
+011 30 0     1100         BUN   WIND1,R3
 011 31 0     1101         BUN   SCN1          FINISH WORKING ON CONSTANT
 011 32 0     1102   NTAG  CNST  20000000010
 
@@ -1220,7 +1220,7 @@
 
 
 012 29 0     1175   R19   STP   WINDX         N(
-012 30 0     1176         BUN   FIND1,R2      PROCESS CONSTANT
+012 30 0     1176         BUN   WIND1,R2      PROCESS CONSTANT
 012 31 0     1177   R19P  CAD   DOT           IF NOT A LABEL, INSERT IMPLIED MULT
 012 32 0     1178         BUN   SCN5
 
@@ -1298,21 +1298,21 @@
 013 05 0     1242         CLL   SW3
 013 06 0     1243         STA   SYMBL,01
 013 07 0     1244         BUN   SCN1
-013 08 0
+
 
 013 10 0     1245   R25   STP   OPRTX,SCN10   (, ,, ,) ()
 013 11 0     1246         BUN   OPRT          INSERT THE EMPTY OPERATOR
 
 
 013 14 0     1247   R26   STP   OPRTX,*+2     ($ $$
-013 15 0     1247         BUN   OPRT
-013 16 0     1248         LDB   FUNS
-013 17 0     1249         IFL - 0,12,10       INCREASE THE SEMICOLON COUNT
-013 18 0     1250         CAD - 0
-013 19 0     1251         IFL   OMCRM,00,I
-013 20 0     1252         BSA   SCNI,2
-013 21 0     1253         IFL   TAG,00,1
-013 22 0     1254         BUN   SCN1
+013 15 0     1248         BUN   OPRT
+013 16 0     1249         LDB   FUNS
+013 17 0     1250         IFL - 0,12,10       INCREASE THE SEMICOLON COUNT
+013 18 0     1251         CAD - 0
+013 19 0     1252         IFL   OMCRN,00,I
+013 20 0     1253         BSA   SCN1,2
+013 21 0     1254         IFL   TAG,00,1
+013 22 0     1255         BUN   SCN1
 
 
 013 25 0     1256   R27   DEFN  SCN1          $)
@@ -1703,7 +1703,7 @@
 017 10 0     1614         BUN 4 9999,IMAGE
 017 11 0     1615         CLL   SCNCT
 017 12 0     1616         STB   LCCT,62
-017 13 0     1617         IFL   SCCT,62,1
+017 13 0     1617         IFL   LCCT,62,1
 017 14 0     1618   CCBEG IFL   SCNCT,00,02   START IN COLUMN 2
 017 15 0     1619         BUN   INP1
 017 16 0     1620   *E    IFL   SCNCT,05,10   HIGH SPEED IGNORING OF SUCCESSIVE
@@ -2123,8 +2123,8 @@
 021 29 0     1980   *C    CLL   DELTA
 021 30 0     1981         IFL   DELTA,00,3
 021 31 0     1982         BUN   NORM
-021 32 0
-021 33 0
+
+
 021 34 0     1983   SEMI  BSA   C+,2          SEMICOLON GENERATOR.
 021 35 0     1984         LDB   OMCRN         CHECKS FIRST FOR LABEL MODE.
 021 36 0     1985         CLL   OMCRN         EXIT IF EXPECTING A SEMICOLON
@@ -2259,9 +2259,9 @@
 022 65 0     2096   *B    CLL   DESCR
 022 66 0     2097         STP   PASSX
 022 67 0     2098         BUN   PASS
-022 68 0     2099         BFA   L-,02.24      LEFT PARENTHESIS
+022 68 0     2099         BFA   L-,02,24      LEFT PARENTHESIS
 022 69 0     2100         BFA   N+,91,8       NUMERIC
-022 70 0     2101         BFA   D+,02.03      DOT
+022 70 0     2101         BFA   D+,02,03      DOT
 022 71 0     2102         BFA   C+,02,23      COMMA
 022 72 0     2103         BFA   S+,02,14      STAR
 022 73 0     2104         BFA   R+,02,04      RIGHT PARENTHESIS
@@ -2321,7 +2321,7 @@
 023 27 0     2158         BUN   R-
 
 
-023 30 0     2159   SGMT  CAA   PREF          SEGMENT BEGINNING.
+023 30 0     2159   SGMT  CAA   PREV          SEGMENT BEGINNING.
 023 31 0     2160         ADA   BUF+98        IF BUFFER NOT EMPTY, DUMP IT
 023 32 0     2161         BZA   *+3
 023 33 0     2162         STP   WRITX
@@ -2618,8 +2618,8 @@
 026 24 0     2431         STP   LIBRX         PUT MONITOR SUBROUTINE INTO PROGRAM
 026 25 0     2432         BUN   LIBRF
 026 26 0     2433         BUN   MONT+1
-026 27 0
-026 28 0
+
+
 026 29 0     2434   SUBR  IFL   TAG,00,1      SUBROUTINE
 026 30 0     2435         DFL   NU,62,29
 026 31 0     2436         IFL   DELTA,00,4
@@ -2649,7 +2649,7 @@
 026 55 0     2458         DLB   V2,64,0       IS IT AN EXT STATEMENT OR EXT PROCEDURE
 026 56 0     2459         DBB   A+,PRCMD
 026 57 0     2460         STP   TRTGX         EXTERNAL STATEMENT
-026 58 0     2461         BUN   TRTGZ         DEFINE IT
+026 58 0     2461         BUN   TRTG2         DEFINE IT
 026 59 0     2462         CAD   BUF           RECORD ITS SEGMENT NUMBER
 026 60 0     2463         DLB   L,64,0        (THE OVERLAY WILL FIX UP ANY
 026 61 0     2464         DFL - 0,12,20
@@ -2756,7 +2756,7 @@
 
 
 
-027 65 0     2539   SEMIC STP   COMPLX        SEMICOLON IS THOUGHT OF A )(
+027 65 0     2539   SEMIC STP   CMPLX         SEMICOLON IS THOUGHT OF A )(
 027 66 0     2540         BUN   RIGHT
 027 67 0     2541         STP   CMPLX         THIS INNOCENT-LOOKING THING MAY CAUSE
 027 68 0     2542         BUN   LEFT          ALL SORTS OF THINGS TO HAPPEN.
@@ -2926,7 +2926,7 @@
 029 32 0     2682         CNST  34652540000   (EXTRA RIGHT PARENTHESIS)
 029 33 0     2683   *E    CFA   LPAR,67
 029 34 0     2684         BCE   B+            DO ALL OPERATIONS OUTSTANDING SINCE
-029 35 0     2685         STP   BENRX         LAST LEFT PARENTHESIS
+029 35 0     2685         STP   GENRX         LAST LEFT PARENTHESIS
 029 36 0     2686         BUN   GENR
 029 37 0     2687         BUN   RIGHT
 029 38 0     2688   *B    STP   DECNX         CHANGE PARENTHESIS COUNT
@@ -2989,7 +2989,7 @@
 029 95 0     2743         STA   G
 029 96 0     2744         LDR   XI
 029 97 0     2745         BZR   A+
-029 98 0     2746         CLL   AI            OMIT SLT10 INSTRUCTION, IF STA OR SRT10
+029 98 0     2746         CLL   XI            OMIT SLT10 INSTRUCTION, IF STA OR SRT10
 029 99 0     2747         BFA   B+,62,40            FOLLOWS
 030 00 0     2748         CFA   SRT10,07
 030 01 0     2749         BCU   A+
@@ -3091,7 +3091,7 @@
 
 030 98 0     2844   LASMB LDB   INSTR         LITTLE ASSEMBLER.
 030 99 0     2845         LDR - V
-031 00 0     2846         DLB - B,64,0        ASSEMBLE AN OPERAND FOR ME
+031 00 0     2846         DLB - V,64,0        ASSEMBLE AN OPERAND FOR ME
 031 01 0     2847         CAD - 0
 031 02 0     2848         STA   VIMAG         WHAT KIND OF AN OPERAND
 031 03 0     2849         BFR   T3,11,3        A TEMP STORAGE
@@ -3172,7 +3172,7 @@
 031 78 0     2921         LDR   INSTR          LOCATION LOCN AND INCREMENT LOCN
 031 79 0     2922   WRIT3 STA   WRTF,04       WRIT3 ENTRY - LOCATION IS IN RA(04)
 031 80 0     2923         SUB   PREV          AND INSTRUCTION IS IN REGISTER R
-031 81 0     2924         LDB   CNTR1
+031 81 0     2924         LDB   CNTRI
 031 82 0     2925         BFA   E+,04,0
 031 83 0     2926         SUB   XONE+1        DOES THIS LOCATION EQUAL THE PREVIOUS ONE
 031 84 0     2927         BFA   F+,04,0       (IF SO WE WILL ERASE THE PREVIOUS ONE)
@@ -3211,11 +3211,11 @@
 032 17 0     2960         LDB   C-
 032 18 0     2961         RTF   BUF+1,98
 032 19 0     2962   WRITX BUN   *
-032200
-032210
-032220
+
+
+
 032 23 0     2963   GENXK STB   V1,12         MARK V1 AS IN A-REGISTER
-032 24 0     2964   GENXB CAD   V1            V1 = RESULT
+032 24 0     2964   GENXV CAD   V1            V1 = RESULT
 032 25 0     2965   GENXX STP   INSX,OPRND    PUT RESULT OF SOME GENERATED QUANTITY
 032 26 0     2966         BUN   INS           IN OPERAND STACK AND RECORD IN
 032 27 0     2967         LDB   OPRND         SER THE POSITION WHERE STORED
@@ -3371,7 +3371,7 @@
 033 77 0     3110         IBB   LINK-1,EXPF
 033 78 0     3111         LDB   D-            COMPUTE TYPE OF RESULT
 033 79 0     3112         CAD - EXPA
-033 80 0     3113   EXPA  BUN   GENX,0100
+033 80 0     3113   EXPA  BUN   GENXX,0100
 033 81 0     3114   *Q    CAA   V2
 033 82 0     3115         STA   V2            THE SQUARE CASE
 033 83 0     3116         STA   V1
@@ -3409,7 +3409,7 @@
 
 
 034 17 0     3144   GHYPH LDB   OPRND         MINUS OPERATOR
-034 18 0     3145   EX43  CNST  10013110000   SIMPLY REVERSE SIGN DIGIT OF
+034 18 0     3145   EX42  CNST  10013110000   SIMPLY REVERSE SIGN DIGIT OF
 034 19 0     3146         STA - 0             NEXT ITEM IN OPERAND STACK
 034 20 0     3147         BUN   GENRX
 
@@ -3476,7 +3476,7 @@
 034 82 0     3200         BUN   GENXV
 
 
-034 85 0     3201   GFRWF STP   FXUPX         FIX UP FORWARD REFERENCE
+034 85 0     3201   GFWRF STP   FXUPX         FIX UP FORWARD REFERENCE
 034 86 0     3202         BUN   FXUP
 034 87 0     3203         BUN   GENRX
 
@@ -3568,7 +3568,7 @@
 035 74 0     3286         LDR   V2            SEVERAL CASES TO CONSIDER
 035 75 0     3287         STB   V1,23
 035 76 0     3288         IFL   V1,21,3
-035 77 0     3289         DBB   K=,1          CLA,CLL V2  IN FOR STATEMENT
+035 77 0     3289         DBB   K-,1          CLA,CLL V2  IN FOR STATEMENT
 035 78 0     3290         SLA   6
 035 79 0     3291         BFR   K-,11,8       CLA IN PROCEDURE OR FUNCTION CASE
 035 80 0     3292         SLA   6
@@ -3581,7 +3581,7 @@
 
 
 
-035 90 0     3298   GCRC  STP   PRTRX
+035 90 0     3298   GCRC  STP   PMTRX
 035 91 0     3299         BUN   PMTR          ASSEMBLE THE PARAMETER-OBTAINING INSTRUC-
 035 92 0     3300         LDB   OPRND                             TION
 035 93 0     3301         CAD - 0
@@ -3701,7 +3701,7 @@
 037 07 0     3405   GCRH  STP   XSTX          MAKE V1 INTEGRAL,IN MEMORY
 037 08 0     3406         BUN   XST
 037 09 0     3407         CAD   LBCV1         GENERATE LBC V1
-037 10 0     3408         BUN   GENX
+037 10 0     3408         BUN   GENXY
 
 
 037 13 0     3409   GCRI  CAA   G3            GENERATE LSA 9,BUN IOPUS
@@ -3840,7 +3840,7 @@
 038 46 0     3530         STR - 0
 038 47 0     3531         STA   PAREF,04
 038 48 0     3532         BSA   G+,1          (THE FIRST PARAMETER MAY ALREADY BE
-038 49 0     3533         EXT   CUL2          IN REGISTER A)
+038 49 0     3533         EXT   BCUL2         IN REGISTER A)
 038 50 0     3534         SUB   IRSTP         CAD PARAMETER
 038 51 0     3535         STA   VEE,64
 038 52 0     3536         STP   ASMBX
@@ -3882,7 +3882,7 @@
 038 88 0     3570         BFR   D+,04,00      IF CALL BY NAME PARAMETERS HAVE
 038 89 0     3571         CAD   LOCN          APPEARED, ASEMBLE BUN INSTRUCTION
 038 90 0     3572         STA   PLOC          WHICH WILL GO TO THE INITIALIZATION PART
-038 91 0     3573         STP   AXMBX
+038 91 0     3573         STP   ASMBX
 038 92 0     3574         BUN   ASMBL,BUNZ
 038 93 0     3575   *D    IFL   DELTA,04,4
 038 94 0     3576         BUN   GENRX
@@ -3936,9 +3936,9 @@
 
 
 039 44 0     3608   GCRY  CAD   V1            MAKE SURE A SUBSCRIPT IS FIXED POINT
-039 45 0     3609         STP   FIXES
+039 45 0     3609         STP   FIXEX
 039 46 0     3610         BFA   FIXER,21,0
-039 47 0     3611   `     BUN   GENXV
+039 47 0     3611         BUN   GENXV
 
 
 039 50 0     3612   GCRZ  STP   CADX          STOP
@@ -3962,15 +3962,15 @@
 039 68 0     3627   JCROY LDB   *
 039 69 0     3628         STA - 0,44
 039 70 0     3629         BUN   GENRX
-039 71 0
-039 72 0
+
+
 039 73 0     3630   OBTN1 STP   REMX,OPRND
 039 74 0     3631         BUN   REM,*+2       GET   TOP OF OPERAND STACK
 039 75 0     3632         BUN   E+             AND PLACE IT IN V1
 039 76 0     3633         STA   V1
 039 77 0     3634         BUN   A+
-039 78 0
-039 79 0
+
+
 039 80 0     3635   OBTN2 STP   REMX,OPRND    GET TOP OF OPERAND STACK AND PLACE IT IN
 039 81 0     3636         BUN   REM,C+        V2
 039 82 0     3637   *E    STP   WEMX
@@ -3981,8 +3981,8 @@
 039 87 0     3642         BUN   OBTNX         REMOVED, SET SER TO ZERO
 039 88 0     3643   *B    CLL   SER
 039 89 0     3644   OBTNX BUN   *
-039 90 0
-039 91 0
+
+
 039 92 0     3645   PMTR  LDR   KAPPA         SELECTIVELY BRING PARAMETER INTO A REG.
 039 93 0     3646         BZR   A+            HAVE EMPTY SUBSCRIPTS APPEARED
 039 94 0     3647         CLL   KAPPA
@@ -4020,7 +4020,7 @@
 040 26 0     3676         STA   V1,64
 040 27 0     3677         IFL   V1,11,3
 040 28 0     3678         CAD   STAT1
-040 29 0     3679         BUN   ASYBY
+040 29 0     3679         BUN   ASMBY
 040 30 0     3680   ACCX  DEFN  ASMBX
 040 31 0     3680   ACC3  LDR   V1            ACC3.. FREE THE A REGISTER
 040 32 0     3681         BFR   C-,11,0       IF V1 IS IN A, DO ACC1
@@ -4077,14 +4077,14 @@
 040 83 0     3726         BFA   A+,11,2
 040 84 0     3727         STP   CADX
 040 85 0     3728         BUN   CAD1          CHANGE V1 TO INTEGER FORM
-040 86 0     3729         BFA   FIXES,21,1
+040 86 0     3729         BFA   FIXEX,21,1
 040 87 0     3730         DLB   FIXGN,64,00
 040 88 0     3731         STP   LINKX         LINK TO FIX ROUTINE
 040 89 0     3732         BUN   LINK1
 040 90 0     3733         IFL   V1,21,1
 040 91 0     3734         CAD   V1
 040 92 0     3735   FIXEX BUN   *
-040 93 0     3736   *A    BFA   FIXES,21,1    IF V1 IS A CONSTANT,
+040 93 0     3736   *A    BFA   FIXEX,21,1    IF V1 IS A CONSTANT,
 040 94 0     3737         STP   FIXCX         CHANGE IT WITH FIXCN
 040 95 0     3738         BUN   FIXCN
 040 96 0     3739         STA   V1,00
@@ -4343,7 +4343,7 @@
 043 49 0     3982         BUN   WEM,*+2
 043 50 0     3983         CNST  30159610000   IMPROPER BOOLEAN OPERAND
 043 51 0     3984   *H    LDB   TEMP2
-043 52 0     3985   *K    CAD - GEAB2
+043 52 0     3985   *K    CAD - GTAB2
 043 53 0     3986         BUN   I+
 043 54 0     3987   *A    CAD   J             INDEX INTO APPROPRIATE GTAB TABLE
 043 55 0     3988         ADD   J
@@ -4394,7 +4394,7 @@
 044 00 0     4027         SLT   2
 044 01 0     4028         STR   A+
 044 02 0     4029         BFA   C+,02,00
-044 03 0     4030         BFA   ACCI,02,32    POSSIBLY GENERATE A STORE INTO
+044 03 0     4030         BFA   ACC1,02,32    POSSIBLY GENERATE A STORE INTO
 044 04 0     4031         BFA   ACC2,02,33    TEMP STORAGE
 044 05 0     4032         STA   B-,04
 044 06 0     4033         LDB   B-
@@ -4407,7 +4407,7 @@
 044 13 0     4040         STR   ACTBL+5,21
 044 14 0     4041         SRS   10
 044 15 0     4042         STA   B-,04         SET ACCUM TO THE CURRENT RESULT
-044 16 0     4043         LDB   -
+044 16 0     4043         LDB -
 044 17 0     4044         CAD - ACTBL-1
 044 18 0     4045         STA   ACCUM
 044 19 0     4046   INTRX BUN   *
@@ -4434,7 +4434,7 @@
 044 40 0     4063         BUN   LIBRF
 
 
-044 43 0     4064   FXUP  LDR   LOCK          COMPILE TO SET A PREVIOUS FORWARD
+044 43 0     4064   FXUP  LDR   LOCN          COMPILE TO SET A PREVIOUS FORWARD
 044 44 0     4065         STA   DESCR
 044 45 0     4066         SRT   4
 044 46 0     4067         STR   DESCR,04
@@ -4465,7 +4465,7 @@
 044 71 0     4092   *A    DLB   CNTRF,04,1
 044 72 0     4093         STR - BUF+3
 044 73 0     4094         BUN   WRIT6
-044 74 0     4095   FXUPX DEFN  WRTX
+044 74 0     4095   FXUPX DEFN  WRITX
 044 75 0     4095   PREV  DEFN  BUF+99
 
 
@@ -4487,7 +4487,7 @@
 
 
 044 95 0     4109   LOC   DEFN  *
-044 96 0     4109         LOC   *+7
+044 96 0     4109         LOCN  *+7
 044 97 0     4116   SCRTB F244  08,REAL,0     SCRAMBLE TABLE FOR IDENTIFIERS
 044 98 0     4117         HLT   0
 044 99 0     4118         HLT   0             THIS TABLE IS INITIALIZED TO
diff --git a/software/tools/BAC-Assembler.html b/software/tools/BAC-Assembler.html
index f7b785e..51bd6fb 100644
--- a/software/tools/BAC-Assembler.html
+++ b/software/tools/BAC-Assembler.html
@@ -24,8 +24,12 @@
 <meta http-equiv="Content-Style-Type" content="text/css">
 
 <style>
+HTML {
+    height:             100%}
+
 BODY {
     position:           relative;
+    height:             100%;
     margin:             1ex}
 
 BUTTON.greenButton {
@@ -135,9 +139,11 @@ DIV.heading {
     font-weight:        normal}
 
 #TextPanel {
-    position:           relative;
-    height:             250px;
-    width:              820px;
+    position:           absolute;
+    top:                180px;
+    left:               0;
+    bottom:             8px;
+    width:              640px;
     overflow:           scroll;
     padding:            4px;
     border:             1px solid black;
@@ -167,13 +173,10 @@ DIV.heading {
     <iframe id=CROutHopperFrame scrolling=auto></iframe>
 </div>
 
-<div class=heading>
-    Pass 1 Output
+<div id=TextDiv>
+    <pre id=TextPanel></pre>
 </div>
 
-<pre id=TextPanel>
-</pre>
-
 
 <script>
 "use strict";
@@ -184,7 +187,8 @@ window.addEventListener("load", function() {
     var buffer = "";
     var bufferLength = 0;
     var bufferOffset = 0;
-    var cardsPerMinute = 2000;
+    var cardHandler = startAssembly;
+    var cardsPerMinute = 8000;
     var eofArmed = 0;
     var eolRex = /([^\n\r\f]*)((:?\r[\n\f]?)|\n|\f)?/g;
     var lastReaderStamp = 0;
@@ -194,13 +198,216 @@ window.addEventListener("load", function() {
     var panel = $$("TextPanel");
     var readerState = 0;
 
+    // Input field 0-relative column locations
+    var labelIndex = 4;
+    var opCodeIndex = labelIndex + 6;
+    var operandIndex = labelIndex + 12;
+
     // Card reader ready state
     var readerNotReady = 0;
     var readerReady = 1;
 
-    // Opcode table
-    var opTab = {};
-    var operandRex = /^(\S+)/;
+    // Card data structure
+    var cardData = {
+        offset:         0,
+        length:         0,
+        serial:         0,
+        text:           ""}
+
+    var asciiFilter = [ // translate ASCII to 220 internal character codes
+        // 0   1   2   3   4   5   6   7   8   9   A   B   C   D   E   F
+           0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  //  0-0F
+           0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  // 10-1F
+           0,  0,  0, 33, 13, 24, 10,  0, 24,  4, 14,  0, 23, 20,  3, 21,  // 20-2F
+          80, 81, 82, 83, 84, 85, 86, 87, 88, 89,  0,  0,  0,  0,  0,  0,  // 30-3F
+          34, 41, 42, 43, 44, 45, 46, 47, 48, 49, 51, 52, 53, 54, 55, 56,  // 40-4F
+          57, 58, 59, 62, 63, 64, 65, 66, 67, 68, 69,  0,  0,  0,  0,  0,  // 50-5F
+           0, 41, 42, 43, 44, 45, 46, 47, 48, 49, 51, 52, 53, 54, 55, 56,  // 60-6F
+          57, 58, 59, 62, 63, 64, 65, 66, 67, 68, 69,  0,  0,  0,  0,  0]; // 70-7F
+
+    // Output control
+    var printLine = printPass1;
+
+    /***************************************
+    * Opcode table:
+    *    Each 220 assembler op code is defined by an array with a variable number
+    *    of elements. The first element is the operation code, including any variant
+    *    digit in (41) and is always required. The variant digit may be overlayed by
+    *    other fields in the instruction. If this value is negative, it indicates a
+    *    pseudo-operator or other special handling.
+    *
+    *    The remainder of the array consists of number pairs, one for each comma-
+    *    delimited operand field that may be present. The first number is a code
+    *    indicating the type of field, the second is the default value for that
+    *    field if it is not specified (or is empty) in the operand area of the
+    *    instruction. If the default value is negative, that operand is not optional
+    *    and must be specified.
+    *
+    *    Type codes:
+    *        1 = address field, inserted in (04)
+    *        2 = secondary value inserted in (33)
+    *        3 = secondary value inserted in (44)
+    *        4 = unit or count digit inserted in (01)
+    *        5 = variant digit inserted in (41)
+    *        6 = sL field designator inserted in (22); if specified, insert 1 in (31)
+    *        7 = sL field designator inserted in (22); (31) is undisturbed
+    *        8 = count or value inserted in (32)
+    *        9 = count or value inserted in (42)
+    *       10 = count or value inserted in (21)
+    *       11 = resolved address only
+    ***************************************/
+
+    // Pseudo-instruction codes
+    var pseudoDEFN = -1;
+    var pseudoLOCN = -2;
+    var pseudoCNST = -3;
+    var pseudoF244 = -4;
+    var pseudoF424 = -5;
+    var pseudoFBGR = -6;
+    var pseudoFINI = -9;
+
+    var opTab = {
+        "CAD":  [0x010,  1, -1,  2,  0],
+        "CAA":  [0x110,  1, -1,  2,  0],
+        "ADD":  [0x012,  1, -1,  2,  0],
+        "ADA":  [0x112,  1, -1,  2,  0],
+        "ADL":  [0x010,  1, -1,  3,  0],
+        "CSU":  [0x011,  1, -1,  2,  0],
+        "CSA":  [0x111,  1, -1,  2,  0],
+        "SUB":  [0x013,  1, -1,  2,  0],
+        "SUA":  [0x113,  1, -1,  2,  0],
+        "MUL":  [0x014,  1, -1,  3,  0],
+        "DIV":  [0x015,  1, -1,  3,  0],
+        "RND":  [0x016,  1,  0,  3,  0],
+        "FAD":  [0x022,  1, -1,  2,  0,  4, -1],
+        "FAA":  [0x122,  1, -1,  2,  0,  4, -1],
+        "FSU":  [0x023,  1, -1,  2,  0,  4, -1],
+        "FSA":  [0x123,  1, -1,  2,  0,  4, -1],
+        "FMU":  [0x024,  1, -1,  3,  0],
+        "FDV":  [0x025,  1, -1,  3,  0],
+        "SRA":  [0x048,  1, -1,  2,  0],
+        "SRT":  [0x148,  1, -1,  2,  0],
+        "SRS":  [0x248,  1, -1,  2,  0],
+        "SLA":  [0x049,  1, -1,  2,  0],
+        "SLT":  [0x149,  1, -1,  2,  0],
+        "SLS":  [0x249,  1, -1,  2,  0],
+        "LDR":  [0x041,  1, -1,  3,  0],
+        "LDB":  [0x042,  1, -1,  2,  0],
+        "LBC":  [0x142,  1, -1,  2,  0],
+        "LSA":  [0x043,  1,  0,  5, -1,  2,  0],
+        "STA":  [0x040,  1, -1,  6,  0],
+        "STR":  [0x140,  1, -1,  6,  0],
+        "STB":  [0x240,  1, -1,  6,  0],
+        "STP":  [0x044,  1, -1,  3,  0],
+        "RTF":  [0x029,  1, -1,  8, -1],
+        "CLA":  [0x145,  1,  0,  2,  0],
+        "CLR":  [0x245,  1,  0,  2,  0],
+        "CAR":  [0x345,  1,  0,  2,  0],
+        "CLB":  [0x445,  1,  0,  2,  0],
+        "CAB":  [0x545,  1,  0,  2,  0],
+        "CRB":  [0x645,  1,  0,  2,  0],
+        "CLT":  [0x745,  1,  0,  2,  0],
+        "CLL":  [0x046,  1, -1,  3,  0],
+        "EXT":  [0x017,  1, -1,  3,  0],
+        "CFA":  [0x018,  1, -1,  6,  0],
+        "CFR":  [0x118,  1, -1,  2,  0],
+        "BUN":  [0x030,  1, -1,  3,  0],
+        "BOF":  [0x031,  1, -1,  3,  0],
+        "BRP":  [0x032,  1, -1,  3,  0],
+        "BSA":  [0x033,  1, -1,  5, -1,  2,  0],
+        "BPA":  [0x033,  1, -1,  5,  0,  2,  0],
+        "BMA":  [0x033,  1, -1,  5,  1,  2,  0],
+        "BCH":  [0x034,  1, -1,  2,  0],
+        "BCL":  [0x134,  1, -1,  2,  0],
+        "BCE":  [0x035,  1, -1,  2,  0],
+        "BCU":  [0x135,  1, -1,  2,  0],
+        "BFA":  [0x036,  1, -1,  7, -1,  9, -1],
+        "BZA":  [0x036,  1, -1,  7,  0,  9,  0],
+        "BFR":  [0x037,  1, -1,  7, -1,  9, -1],
+        "BZR":  [0x037,  1, -1,  7,  0,  9,  0],
+        "BCS":  [0x038,  1, -1,  4,  0],
+        "SOR":  [0x039,  1,  0,  2,  0],
+        "SOH":  [0x139,  1,  0,  2,  0],
+        "IOM":  [0x239,  1, -1,  2,  0],
+        "HLT":  [0x000,  1,  0,  3,  0],
+        "NOP":  [0x001,  1,  0,  3,  0],
+        "IBB":  [0x020,  1, -1,  3, -1],
+        "DBB":  [0x021,  1, -1,  3, -1],
+        "IFL":  [0x026,  1, -1,  7, -1,  9, -1],
+        "DFL":  [0x027,  1, -1,  7, -1,  9, -1],
+        "DLB":  [0x028,  1, -1,  7, -1,  9, -1],
+        "MTS":  [0x050,  1, -1,  4, -1,  8, -1],
+        "MFS":  [0x4000050,
+                         1, -1,  4, -1,  8, -1],
+        "MTC":  [0x051,  1, -1,  4, -1,  8, -1,  5, -1],
+        "MFC":  [0x4000051,
+                         1, -1,  4, -1,  8, -1,  5, -1],
+        "MRD":  [0x052,  1, -1,  4, -1, 10, -1,  5,  0],
+        "MNC":  [0x052,  1, -1,  4, -1,  8, -1,  5,  1],
+        "MRR":  [0x053,  1, -1,  4, -1, 10, -1,  5,  0],
+        "MIW":  [0x054,  1, -1,  4, -1, 10, -1,  9, -1],
+        "MIR":  [0x055,  1, -1,  4, -1, 10, -1,  9,  0],
+        "MOW":  [0x056,  1, -1,  4, -1, 10, -1,  9, -1],
+        "MIR":  [0x057,  1, -1,  4, -1, 10, -1,  9,  0],
+        "MPF":  [0x058,  4, -1, 10, -1,  1,  0],
+        "MPB":  [0x158,  4, -1, 10, -1,  1,  0],
+        "MPE":  [0x258,  4, -1,  1,  0],
+        "MLS":  [0x450,  4, -1,  8, -1,  1,  0],
+        "MRW":  [0x850,  4, -1,  8, -1,  1,  0],
+        "MDA":  [0x950,  4, -1,  8, -1,  1,  0],
+        "MIB":  [0x059,  1, -1,  4, -1,  8,  0],
+        "MIE":  [0x159,  1, -1,  4, -1,  8,  0],
+        "PRD":  [0x003,  1, -1,  4, -1,  8, -1,  5,  0],
+        "PRB":  [0x004,  1, -1,  4, -1,  5,  0,  8,  0],
+        "PRI":  [0x005,  1, -1,  4, -1,  8, -1,  5,  0],
+        "PWR":  [0x006,  1, -1,  4, -1,  8, -1],
+        "PWI":  [0x007,  1, -1,  4, -1],
+        "CRD":  [0x060,  1, -1,  4, -1,  5,  0],
+        "CWR":  [0x061,  1, -1,  4, -1,  5, -1,  8,  0],
+        "CRF":  [0x062,  1, -1,  4, -1,  5, -1,  8,  0],
+        "CWF":  [0x063,  1, -1,  4, -1,  5, -1,  8,  0],
+        "CRI":  [0x064,  1, -1,  4, -1],
+        "CWI":  [0x065,  1, -1,  4, -1],
+        "KAD":  [0x008,  1,  0,  3,  0],
+        "SPO":  [0x009,  1, -1,  8, -1],
+
+        // Pseudo-ops
+        "DEFN": [pseudoDEFN,                    // define symbol
+                        11, -1],
+        "LOCN": [pseudoLOCN,                    // set location counter
+                        11, -1],
+        "CNST": [pseudoCNST],                   // assemble list of constant values
+        "F244": [pseudoF244,                    // assemble word from 22-64-04 fields
+                         1,  0,  1,  0,  1,  0],
+        "F424": [pseudoF424,                    // assemble word from 44-62-04 fields
+                         1,  0,  1,  0,  1,  0],
+        "FBGR": [pseudoFBGR],                   // assemble Cardatron format band
+        "FINI": [pseudoFINI,                    // finish assembly, output constant pool
+                         1,  0]
+    };
+
+    // Tank entry types
+    var tankFini = 0;
+    var tankError = 1;
+    var tankComment = 2;
+    var tankInstruction = 3;
+    var tankPseudo = 4;
+
+
+    // Assembly storage
+    var errorCount = 0;                 // assembler error count
+    var location = 0;                   // current instruction address
+    var tank = [];                      // assembled line structures {serial, type, location, word, offset, length}
+
+    // Symbol table: holds the address value for each label
+    var symTab = {};
+
+    // Point-label table: holds the current sequence number for each point label
+    var pointTab = {};
+
+    // Pool constant table: holds address of the constant word
+    var poolTab = {};
+
 
     /**************************************/
     function $$(id) {
@@ -213,14 +420,16 @@ window.addEventListener("load", function() {
         "fill". If fill is empty or missing, space is used. If the initial string is
         longer than "len", it is truncated on the left to that length */
         var pad = (fill || " ").charAt(0);
-        var result = s;
-        var rLen = s.length;
+        var result = s.toString();
+        var rLen = result.length;
 
         if (rLen > len) {
             result = result.substring(rLen-len);
-        } else while (rLen < len) {
-            result = pad + result;
-            ++rLen;
+        } else {
+            while (rLen < len) {
+                result = pad + result;
+                ++rLen;
+            }
         }
 
         return result;
@@ -232,28 +441,21 @@ window.addEventListener("load", function() {
         "fill". If fill is empty or missing, space is used. If the initial string is
         longer than "len", it is truncated on the right to that length */
         var pad = (fill || " ").charAt(0);
-        var result = s;
+        var result = s.toString();
         var rLen = s.length;
 
         if (rLen > len) {
             result = result.substring(0, len);
-        } else while (rLen < len) {
-            result = result + pad;
-            ++rLen;
+        } else {
+            while (rLen < len) {
+                result = result + pad;
+                ++rLen;
+            }
         }
 
         return result;
     }
 
-    /**************************************/
-    function appendLine(text) {
-        /* Appends "text"+NL as a new text node to the panel DOM element */
-        var e = document.createTextNode(text + "\n");
-
-        panel.appendChild(e);
-        panel.scrollTop += 30
-    }
-
     /**************************************/
     function clearPanel() {
         /* Clears the text panel */
@@ -295,9 +497,10 @@ window.addEventListener("load", function() {
     }
 
     /**************************************/
-    function readACard(successor) {
+    function readACard(successor, cardData) {
         /* Reads one card image from the buffer, pads or trims the image as
-        necessary to 80 columns, and calls the "successor" function with it.
+        necessary to 80 columns, and calls the "successor" function with it
+        and its location in the buffer.
         If the reader is not ready, nothing happens */
         var bx = bufferOffset;
         var card;
@@ -308,10 +511,12 @@ window.addEventListener("load", function() {
         var delta = millisPerCard - stamp + lastReaderStamp;
 
         lastReaderStamp = stamp;
+        cardData.offset = bx;
 
         if (readerState != readerReady) {
-            ; // just exit
+            cardData.length = -1;          // just exit
         } else if (bx >= bufferLength) {
+            cardData.length = 0;
             setReaderReady(false);
             $$("CRProgressBar").value = 0;
         } else {
@@ -337,7 +542,11 @@ window.addEventListener("load", function() {
                 }
             }
 
+            cardData.length = bx - bufferOffset;
+            ++cardData.serial;
+            cardData.text = card;
             bufferOffset = bx;
+
             $$("CRProgressBar").value = bufferLength-bx;
             while (outHopper.childNodes.length > 1) {
                 outHopper.removeChild(outHopper.firstChild);
@@ -346,9 +555,9 @@ window.addEventListener("load", function() {
             outHopper.appendChild(document.createTextNode(line));
 
             if (delta < 2) {
-                successor(card);
+                successor(cardData);
             } else {
-                setTimeout(successor, delta, card);
+                setTimeout(successor, delta, cardData);
             }
         }
     }
@@ -361,7 +570,7 @@ window.addEventListener("load", function() {
             if (bufferOffset >= bufferLength) {
                 //alert("Empty hopper.");
                 if (eofArmed) {
-                    appendLine("\\\\\\\\\\  [EOF]  /////");
+                    printLine("\\\\\\\\\\  [EOF]  /////");
                     armEOF(false);
                 }
             } else {
@@ -439,31 +648,652 @@ window.addEventListener("load", function() {
     }
 
     /**************************************/
-    function checkBrowser() {
-        /* Checks whether this browser can support the necessary stuff */
-        var missing = "";
+    function startReader() {
+        /* Reads a deck of cards and displays them until the reader goes empty */
 
-        if (!window.File) {missing += ", File"}
-        if (!window.FileReader) {missing += ", FileReader"}
-        if (!window.FileList) {missing += ", FileList"}
-        if (!window.DOMTokenList) {missing += ", DOMTokenList"}
-        if (!window.ArrayBuffer) {missing += ", ArrayBuffer"}
-        if (!window.DataView) {missing += ", DataView"}
-        if (!(window.performance && "now" in performance)) {missing += ", performance.now"}
+        readACard(cardHandler, cardData);
+    }
 
-        if (missing.length == 0) {
-            return false;
+    /**************************************/
+    function printPass1(text) {
+        /* Appends "text"+NL as a new text node to the panel DOM element */
+        var e = document.createTextNode(text + "\n");
+
+        panel.appendChild(e);
+        panel.scrollTop += 30
+    }
+
+    /**************************************/
+    function printError(msg) {
+        ++errorCount;
+        printLine("******** " + msg);
+        printLine("");
+    }
+
+    /**************************************/
+    function declarePointLabel(label, location) {
+        /* For each instance of a point label in the label field, creates a
+        pseudo-label in the symbol table with the next number for that point */
+        var labelID;
+        var pointNr;
+
+        if (label in pointTab) {
+            pointNr = ++pointTab[label];
         } else {
-            alert("No can do... your browser does not support the following features:\n" + missing.substring(2));
-            return true;
+            pointNr = pointTab[label] = 1;
+        }
+
+        labelID = label + padLeft(pointNr, 5-label.length, ".");
+        if (labelID in symTab) {
+            printError("DUPLICATE LABEL IN POINT TABLE -- IMPOSSIBLE")
+        } else {
+            symTab[labelID] = location;
         }
     }
 
     /**************************************/
-    function startReader() {
-        /* Reads a deck of cards and displays them until the reader goes empty */
+    function fetchPointLabel(label, forward) {
+        /* Accesses the location of the specified point label in the forward or
+        backward direction. Returns the location of that label, or -1 if the
+        label is currently undefined */
+        var labelID;
+        var pointNr;
 
-        readACard(processCard);
+        if (label in pointTab) {
+            pointNr = pointTab[label];
+        } else {
+            pointNr = pointTab[label] = 0;
+            if (!forward) {
+                printError("BACKWARD REFERENCE TO UNDECLARED POINT LABEL: " + label);
+            }
+        }
+
+        if (forward) {
+            ++pointNr;
+        }
+
+        labelID = label + padLeft(pointNr, 5-label.length, ".");
+        if (labelID in symTab) {
+            return symTab[labelID];
+        } else {
+            return -1;
+        }
+    }
+
+    /**************************************/
+    function parseNumber(text, token, sign) {
+        /* Parses a decimal number up to 11 digits in length starting at the
+        current offset in "text". If the number is less than 11 digits long,
+        the sign is applied as the high-order digit. Returns the decimal string
+        in token.text and the binary value as the function result */
+        var c;
+        var length = text.length;
+        var raw = "";
+        var x = token.offset;
+
+        while (x < length) {
+            c = text.charAt(x);
+            if (c >= "0" && c <= "9") {
+                ++x;
+                raw += c;
+            } else {
+                break; // out of while loop
+            }
+        }
+
+        if (raw.length > 11) {
+            printError("NUMERIC CONSTANT LONGER THAN 11 DIGITS: " + raw);
+            raw = raw.substring(raw.length-11);
+        } else if (raw.length < 11) {
+            raw = sign.toString() + padLeft(raw, 10, "0");
+        }
+
+        token.newOffset = x;
+        token.text = raw;
+        return parseInt(raw, 10);
+    }
+
+    /**************************************/
+    function parseString(text, token, singleWord) {
+        /* Parses a $-delimited string starting at the current offset in "text".
+        Returns the text of the string in token.text and an array of binary words
+        with the string translated to 220 character code as the function result.
+        The binary words will all have sign digits set to 2.
+        Strings less than multiple of five characters are padded to a multiple
+        of five with spaces (binary zeroes). If "singleWord" is true, the string
+        must be five or fewer characters in length */
+        var c;
+        var code;
+        var count = 0;
+        var doubleDollar = false;
+        var length = text.length
+        var raw = "";
+        var values = [];
+        var word = 2;
+        var x = token.offset;
+
+        function appendCode(code) {
+            if (count >= 5) {       // push out the full word
+                values.push(word);
+                word = 2;
+                count = 0;
+            }
+
+            word = word*100 + code;
+            ++count;
+        }
+
+        if (++x < length) {             // bypass the initial "$"
+            c = text.charAt(x);
+            if (c == "$") {
+                ++x;                    // bypass the second "$"
+                doubleDollar = true;    // don't know what this means yet
+                appendCode(16);         // carriage return
+            }
+        }
+
+        while (x < length) {
+            c = text.charAt(x);
+            if (c == "$") {
+                break;
+            } else {
+                raw += c;
+                code = c.charCodeAt(0);
+                appendCode((code < asciiFilter.length ? asciiFilter[code] : 0));
+                ++x;
+            }
+        }
+
+        while (count < 5) {             // pad out final word with spaces
+            appendCode(0);
+        }
+
+        if (x >= length) {
+            printError("$-STRING NOT TERMINATED");
+        } else {
+            ++x;                        // bypass the terminating "$"
+            if (doubleDollar) {
+                if (x >= length) {
+                    printError("$$-STRING NOT TERMINATED");
+                } else if (text.charAt(x) == "$") {
+                    ++x;                // bypass the second terminating "$"
+                    appendCode(16);     // carriage return
+                } else {
+                    printError("$$-STRING NOT TERMINATED");
+                }
+            }
+        }
+
+        values.push(word);              // push out final word
+        if (singleWord && values.length > 1) {
+            printError("STRING OCCUPIES MORE THAN ONE WORD");
+        }
+
+        token.newOffset = x;
+        token.text = raw;
+        return values;
+    }
+
+    /**************************************/
+    function parseAddressPrimary(text, token, resolved) {
+        /* Parses the next address primary from "text" starting at "token.offset",
+        returning the parsed item in "token.text" and the updated parse offset
+        in "token.newOffset". "token.type" indicates the type:
+            0: empty primary
+            1: *, the current location counter
+            2: integer constant
+            3: regular label
+            4: backward point label (without the leading * or the trailing -)
+            5: forward point label  (ditto, without the trailing +)
+            6: pool constant, 1-11 digit number with a leading + or -)
+        */
+        var c;
+        var length = text.length;
+        var raw = "";
+        var val = 0;
+        var x = token.offset;
+
+        if (x >= length) {                      // empty primary
+            token.type = 0;
+            token.newOffset = length;
+            token.text = "";
+        } else {
+            c = text.charAt(x);
+            switch (true) {
+            case (c == "*"):                    // parse current location counter
+                token.type = 1;
+                token.text = c;
+                token.newOffset = x+1;
+                break;
+
+            case (c >= "0" && c <= "9"):        // parse integer constant
+                val = parseNumber(text, token, 0);
+                token.type = 2;
+                if (val > 9999) {
+                    printError("INTEGER CONSTANT LONGER THAN 4 DIGITS: " + token.text);
+                }
+                break;
+
+            case (c >= "A" && c <= "Z"):        // regular or point label
+                raw = c;
+                while (++x < length) {
+                    c = text.charAt(x);
+                    if (c >= "A" && c <= "Z") {
+                        raw += c;
+                    } else if (c >= "0" && c <= "9") {
+                        raw += c;
+                    } else {
+                        break;  // out of while loop
+                    }
+                }
+
+                if (raw.length > 5) {
+                    printError("LABEL LONGER THAN 5 CHARACTERS: " + raw);
+                }
+
+                // Check if it's a point label (could be followed by an adding operator)
+                if (x >= length) {
+                    token.type = 3;     // label is at the end, can't be a point label
+                } else if (c != "+" && c != "-") {
+                    token.type = 3;     // not followed by +/-, not a point label
+                } else {
+                    token.type = (c == "-" ? 4 : 5);
+                    if (x+1 >= length) {
+                        ++x;            // +/- is at the end, a point label
+                    } else {
+                        c = text.charAt(x+1);
+                        if (c == " ") {
+                            ++x;        // +/- followed by a space, a point label
+                        } else if (c == ",") {
+                            ++x;        // +/- followed by a comma, a point label
+                        } else if (c == "+" || c == "-") {
+                            ++x;        // +/- followed by a +/-, a point label
+                        } else {
+                            token.type = 3;     // not a point label
+                        }
+                    }
+                }
+
+                token.text = raw;
+                token.newOffset = x;
+                break;
+
+            case (c == "+" || c == "-"):        // parse pool constant
+                raw = c;
+                if (++x >= length) {
+                    printError("INVALID POOL CONSTANT SYNTAX");
+                    token.newOffset = x;
+                } else {
+                    token.offset = x;
+                    c = text.charAt(x);
+                    if (c >= "0" && c <= "9") {
+                        parseNumber(text, token, "");
+                        if (token.text.length > 10) {
+                            printError("POOL CONSTANT LONGER THAN 10 DIGITS: " + token.text);
+                        }
+                        token.text = raw + padLeft(token.text, 10, "0");
+                    } else if (c == "$") {
+                        parseString(text, token, true);
+                        token.text = "$" + token.text.substring(0, 5);
+                    } else if (c == " " || c == ",") {
+                        printError("EMPTY POOL CONSTANT");
+                    } else {
+                        val = evaluateAddress(text, token, resolved);
+                        token.text = raw + padLeft(val, 10, "0");
+                    }
+                }
+
+                token.type = 6;
+                break;
+
+            case (c == " "):                    // empty primary
+                token.type = 0;
+                token.newOffset = x;
+                token.text = "";
+                break;
+
+            default:                            // not valid
+                token.type = 0;
+                token.newOffset = x;
+                token.text = "";
+                printError("ADDRESS PRIMARY CANNOT START WITH \"" + c + "\"");
+                break;
+            } // switch true
+        }
+    }
+
+    /**************************************/
+    function evaluateAddress(text, token, resolved) {
+        /* Evaluates the current offset in "text" as an address expression and
+        returns its binary value. If "resolved" is true, the address must resolve
+        to a known address, otherwise an error is issued. If the address cannot
+        be resolved, returns -1.
+        Address expressions consist of a list of address primaries delimited
+        by + or - operators. See parseAddressPrimary() for a definition */
+        var address = 0;                // result address
+        var label;
+        var length = text.length;       // length of operand text
+        var adding = 1;                 // +/- operator
+        var unresolvable = false;       // true if address cannot be resolved
+        var val;                        // value of primary
+
+        do {
+            parseAddressPrimary(text, token, resolved);
+            switch (token.type) {
+            case 0:                     // empty text
+                val = 0;
+                break;
+            case 1:                     // *, current location counter
+                val = location;
+                break;
+            case 2:                     // integer constant
+                val = parseInt(token.text, 10);
+                break;
+            case 3:                     // regular label
+                if (token.text in symTab) {
+                    val = symTab[token.text];
+                } else {
+                    symTab[token.text] = val = -1;
+                    unresolvable = true;
+                }
+                break;
+            case 4:                     // backward point label
+            case 5:                     // forward point label
+                label = "*" + token.text;
+                val = fetchPointLabel(label, token.type == 5);
+                if (val < 0) {
+                    val = -1;
+                    unresolvable = true;
+                }
+                break;
+            case 6:                     // pool constant
+                if (token.text in poolTab) {
+                    val = poolTab[token.text];
+                } else {
+                    poolTab[token.text] = val = -1;
+                    unresolvable = true;
+                }
+                break;
+            default:
+                printError("INVALID ADDRESS TOKEN TYPE CODE: " + token.type);
+                break;
+            } // switch token.type
+
+            if (resolved && unresolvable) {
+                printError("MUST BE A RESOLVED ADDRESS: " + token.text);
+            }
+
+            address += val*adding;
+
+            if (token.newOffset < length) {
+                switch (text.charAt(token.newOffset)) {
+                case "+":
+                    adding = 1;
+                    token.offset = ++token.newOffset;
+                    break;
+                case "-":
+                    adding = -1;
+                    token.offset = ++token.newOffset;
+                    break;
+                default:
+                    length = -1;        // exit do loop
+                    break;
+                }
+            }
+        } while (token.newOffset < length);
+
+        return (unresolvable ? -1 : address);
+    }
+
+    /**************************************/
+    function evaluateOperand(text, token, resolved) {
+        /* Parses and evaluates the fields of a standard operand. An operand
+        consists of a comma-delimited list of address values. Each address value
+        is a sequence of address primaries delimited by + or - operators. The
+        operand is terminated by the first space character. If "resolved" is
+        true, all address values must resolve to defined addresses, otherwise
+        an error is produced and the resulting address value will be -1.
+        Returns an array of address values */
+        var c;
+        var length = text.length;
+        var values = [];
+
+        while (token.offset < length) {
+            values.push(evaluateAddress(text, token, resolved));
+            if (token.newOffset < length) {
+                c = text.charAt(token.newOffset);
+                if (c == ",") {
+                    token.offset = ++token.newOffset;   // continue with next field
+                } else if (c == " ") {
+                    break; // out of while loop
+                } else {
+                    ++token.newOffset;
+                    printError("INVALID OPERAND LIST: " + c);
+                    break;
+                }
+            }
+        }
+
+        //for (var x=0; x<values.length; ++x) {
+        //    printLine("                                                         DEBUG: " + padLeft(values[x], 11));
+        //}
+
+        return values;
+    }
+
+    /**************************************/
+    function parseConstantList(text, token) {
+        /* Parses the operand text for the CNST pseudo-operator and returns an
+        array of binary words with the values found */
+        var c;
+        var length = text.length;
+        var val2;
+        var values = [];
+        var x;
+
+        while (token.offset < length) { // parse comma-delimited values
+            c = text.charAt(token.offset);
+            if (c == ",") {
+                values.push(0);
+            } else if (c == "+") {
+                ++token.offset;
+                values.push(parseNumber(text, token, 0));
+            } else if (c == "-") {
+                ++token.offset;
+                values.push(parseNumber(text, token, 1));
+            } else if (c >= "0" && c <= "9") {
+                values.push(parseNumber(text, token, 0));
+            } else if (c == "$") {
+                val2 = parseString(text, token, false);
+                for (x=0; x<val2.length; ++x) {
+                    values.push(val2[x]);
+                }
+            }
+
+            if (token.newOffset < length) {
+                c = text.charAt(token.newOffset);
+                if (c == ",") {
+                    token.offset = ++token.newOffset;   // continue with next value
+                } else if (c == " ") {
+                    break; // out of while loop
+                } else {
+                    printError("INVALID CONSTANT LIST: " + c);
+                    break; // out of while loop
+                }
+            }
+        } // while x
+
+        //for (x=0; x<values.length; ++x) {
+        //    printLine("                                                         DEBUG: " + padLeft(values[x], 11));
+        //}
+
+        return values;
+    }
+
+    /**************************************/
+    function startAssembly(cardData) {
+        /* Callback function for the card reader. Reads the control cards and
+        then passes control to pass 1 of the assembler */
+        var card = cardData.text;
+        var opCode = card.substring(opCodeIndex, opCodeIndex+5);
+
+        switch (opCode) {
+        case "ASMBL":
+            readACard(startAssembly, cardData);
+            break;
+        case "REORD":
+            readACard(startAssembly, cardData);
+            break;
+        default:
+            cardHandler = assemblePass1;
+            assemblePass1(cardData);
+            break;
+        }
+    }
+
+    /**************************************/
+    function assemblePass1(cardData) {
+        /* Callback function for the card reader. Processes the card image for
+        pass 1 of the assembler */
+        var card = cardData.text;
+        var entry;
+        var finito = false;
+        var label = card.substring(labelIndex, labelIndex+5).trim();
+        var opCode = card.substring(opCodeIndex, opCodeIndex+4).trim();
+        var opDesc;
+        var operand = card.substring(operandIndex, operandIndex+56);
+        var sign = card.substring(opCodeIndex+4, opCodeIndex+5);
+        var tankType = tankComment;
+        var text;
+        var thisLoc = location;
+        var values;
+        var x;
+
+        var token = {                   // token structure for operand parsing
+            type: 0,
+            offset: 0,
+            text: "",
+            newOffset: -1};
+
+        if (opCode.length <= 0) {
+            text = "                     " + card.substring(labelIndex, 72);
+            printLine(text);
+        } else {
+            text = card.substring(72, 80) + "     " + padLeft(location, 4, "0") + "   " + card.substring(labelIndex, 72);
+            printLine(text);
+
+            if (!(opCode in opTab)) {
+                tankType = tankError;
+                printError("INVALID OP CODE");
+            } else {
+                opDesc = opTab[opCode];
+                if (opDesc[0] >= 0) {   // normal instruction
+                    tankType = tankInstruction;
+                    values = evaluateOperand(operand, token, false);   // discard result, take only side effects
+                    ++location;         // normal instructions bump the location counter
+                } else {
+                    // Parse the pseudo-op for size and location
+                    tankType = tankPseudo;
+                    switch (opDesc[0]) {
+                    case pseudoDEFN:
+                        values = evaluateOperand(operand, token, false);
+                        if (values.length > 0) {
+                            thisLoc = values[0];
+                        } else {
+                            printError("OPERAND ADDRESS REQUIRED");
+                        }
+                        break;
+                    case pseudoLOCN:
+                        values = evaluateOperand(operand, token, true);
+                        if (values.length < 1) {
+                            printError("OPERAND ADDRESS REQUIRED");
+                        } else if (values[0] >= 0) {
+                            location = thisLoc = values[0];
+                        }
+                        break;
+                    case pseudoCNST:
+                        values = parseConstantList(operand, token);
+                        location += values.length;
+                        break;
+                    case pseudoF244:
+                    case pseudoF424:
+                        values = evaluateOperand(operand, token, false); // discard result, take only side effects
+                        ++location;     // word-builders merely bump the location counter
+                        break;
+                    case pseudoFBGR:
+                        location += 29; // all format bands are 29 words long
+                        break;
+                    case pseudoFINI:
+                        finito = true;
+                        tankType = tankFini;
+                        values = evaluateOperand(operand, token, true);
+                        break;
+                    default:
+                        printError("INVALID PSEUDO INSTRUCTION CODE: " + opDesc[0]);
+                    } // switch
+                }
+            }
+
+            if (label.length > 0) {         // enter the label into the symbol table
+                if (label.charAt(0) == "*") {
+                    declarePointLabel(label, thisLoc);
+                } else if (!(label in symTab)) {
+                    symTab[label] = thisLoc;
+                } else if (symTab[label] >= 0) {
+                    printError("DUPLICATE LABEL DEFINITION");
+                } else {
+                    symTab[label] = thisLoc;
+                }
+            }
+        }
+
+        entry = {
+            serial: cardData.serial,
+            type: tankType,
+            location: thisLoc,
+            word: 0,
+            offset: cardData.offset,
+            length: cardData.length}
+        tank.push(entry);
+
+        if (!finito) {
+            readACard(assemblePass1, cardData);
+        } else {
+            // Build the constant pool
+            for (text in poolTab) {
+                symTab[text] = location;
+                printLine("             " + padLeft(location, 4, "0") + "               " + text);
+                ++location;
+            }
+
+            // Wrap up Pass 1
+            for (text in symTab) {
+                if (symTab[text] < 0) {
+                    printError("SYMBOL NOT DEFINED: " + text);
+                }
+            }
+
+            printLine("");
+            printLine("END OF PASS 1, ERRORS = " + errorCount);
+            printLine("");
+            printLine("");
+            printLine("SYMBOL TABLE");
+            text = "";
+            thisLoc = 0;
+            values = Object.keys(symTab).sort();
+            for (x=0; x<values.length; ++x) {
+                if (thisLoc > 80) {
+                    printLine(text);
+                    text = "";
+                    thisLoc = 0;
+                }
+
+                text += padLeft(symTab[values[x]], thisLoc-text.length+5) + " " + values[x];
+                thisLoc += 20;
+            }
+
+            printLine(text);
+        }
     }
 
     /**************************************/
@@ -474,10 +1304,11 @@ window.addEventListener("load", function() {
         var match;
         var opCode;
         var operand;
+        var operandRex = /^(\S+)/;
         var x;
 
         // Accumulate statistics
-        // appendLine(card);
+        // printLine(card);
         opCode = card.substring(26, 30).trim();
 
         if (opCode.length > 0) {
@@ -515,9 +1346,9 @@ window.addEventListener("load", function() {
         } else {
             // Report statistics
             setReaderReady(false);
-            appendLine("");
-            appendLine("___________________________");
-            appendLine("");
+            printLine("");
+            printLine("___________________________");
+            printLine("");
             for (opCode in opTab) {
                 entry = opTab[opCode];
                 operand = padRight(opCode, 5);
@@ -525,12 +1356,33 @@ window.addEventListener("load", function() {
                     operand += padLeft(entry[x].toString(), 5);
                 }
 
-                appendLine(operand);
+                printLine(operand);
             }
         }
     }
 
-    /* Start of window.onload() */
+    /**************************************/
+    function checkBrowser() {
+        /* Checks whether this browser can support the necessary stuff */
+        var missing = "";
+
+        if (!window.File) {missing += ", File"}
+        if (!window.FileReader) {missing += ", FileReader"}
+        if (!window.FileList) {missing += ", FileList"}
+        if (!window.DOMTokenList) {missing += ", DOMTokenList"}
+        if (!window.ArrayBuffer) {missing += ", ArrayBuffer"}
+        if (!window.DataView) {missing += ", DataView"}
+        if (!(window.performance && "now" in performance)) {missing += ", performance.now"}
+
+        if (missing.length == 0) {
+            return false;
+        } else {
+            alert("No can do... your browser does not support the following features:\n" + missing.substring(2));
+            return true;
+        }
+    }
+
+    /******************** Start of window.onload() ********************/
     if (checkBrowser()) {
         return;
     }