diff --git a/apps/c1p/6502/JP/ASSEMBLER-1.TXT b/apps/c1p/6502/JP/ASSEMBLER-1.TXT
deleted file mode 100644
index 9d2cb6365..000000000
Binary files a/apps/c1p/6502/JP/ASSEMBLER-1.TXT and /dev/null differ
diff --git a/apps/c1p/6502/JP/ASSEMBLER-2.TXT b/apps/c1p/6502/JP/ASSEMBLER-2.TXT
deleted file mode 100644
index 0f44b3334..000000000
Binary files a/apps/c1p/6502/JP/ASSEMBLER-2.TXT and /dev/null differ
diff --git a/apps/c1p/6502/JP/BASICEXT.65V b/apps/c1p/6502/JP/BASICEXT.65V
deleted file mode 100644
index 7005eb93a..000000000
--- a/apps/c1p/6502/JP/BASICEXT.65V
+++ /dev/null
@@ -1,1247 +0,0 @@
-.0222/20
-C0
-02
-A5
-86
-C9
-1C
-90
-06
-A9
-1C
-85
-86
-86
-85
-8E
-F7
-02
-8E
-F8
-02
-8E
-F9
-02
-A2
-F4
-9A
-4C
-74
-A2
-AD
-00
-DF
-4A
-C9
-6F
-D0
-05
-A9
-03
-4C
-36
-A6
-60
-C9
-07
-F0
-FB
-48
-AD
-00
-DF
-0A
-90
-FA
-68
-48
-29
-7F
-20
-2D
-BF
-8A
-48
-AE
-00
-02
-8A
-C9
-7B
-D0
-0F
-A2
-65
-A9
-0D
-20
-2D
-BF
-A9
-0A
-20
-2D
-BF
-4C
-8E
-02
-29
-1F
-C9
-1B
-D0
-16
-A9
-20
-9D
-00
-D3
-8A
-18
-69
-0A
-AA
-A9
-5F
-9D
-00
-D3
-A9
-00
-85
-0E
-8E
-00
-02
-68
-AA
-68
-4C
-6C
-FF
-A9
-D2
-A0
-02
-4C
-C3
-A8
-2C
-03
-02
-10
-16
-AD
-00
-DF
-29
-FE
-C9
-DE
-F0
-0A
-AD
-00
-F0
-4A
-90
-F1
-AD
-01
-F0
-60
-EE
-03
-02
-4C
-00
-1C
-A2
-05
-BD
-FA
-02
-9D
-18
-02
-BD
-EC
-02
-95
-00
-CA
-10
-F2
-E8
-60
-0D
-0A
-0D
-0A
-4F
-53
-49
-20
-42
-41
-53
-49
-43
-20
-0D
-0A
-52
-65
-61
-64
-79
-0D
-0A
-0D
-0A
-00
-4C
-22
-02
-4C
-9B
-02
-02
-2A
-10
-70
-00
-00
-00
-FF
-A2
-02
-4E
-02
-40
-02
-.1C00/E0
-00
-D0
-28
-AD
-F9
-02
-D0
-23
-A9
-3E
-20
-4E
-02
-20
-4E
-02
-AD
-F8
-02
-F0
-11
-AD
-F6
-02
-20
-12
-1F
-AD
-F5
-02
-20
-12
-1F
-A9
-20
-20
-27
-1F
-A9
-FF
-8D
-F9
-02
-20
-B1
-1D
-C9
-21
-90
-3A
-48
-AD
-00
-DF
-49
-FF
-4A
-90
-07
-29
-03
-D0
-26
-68
-D0
-2A
-29
-03
-D0
-0A
-68
-C9
-61
-B0
-21
-38
-E9
-20
-D0
-1C
-4A
-B0
-12
-68
-C9
-30
-B0
-04
-69
-10
-D0
-10
-C9
-3C
-B0
-0C
-38
-E9
-10
-D0
-07
-68
-C9
-50
-90
-02
-E9
-10
-E0
-47
-F0
-0C
-EC
-F7
-02
-90
-07
-24
-64
-30
-03
-20
-1D
-1E
-C9
-40
-D0
-02
-A9
-5E
-C9
-1B
-D0
-14
-A9
-00
-8D
-03
-02
-8D
-05
-02
-85
-64
-CD
-F8
-02
-F0
-96
-8D
-F8
-02
-D0
-04
-C9
-04
-D0
-09
-A9
-40
-20
-4E
-02
-A2
-00
-A9
-0D
-C9
-08
-D0
-3F
-E0
-00
-F0
-14
-8E
-F3
-02
-A9
-20
-EC
-F7
-02
-F0
-04
-B0
-08
-B5
-13
-20
-C7
-1C
-AE
-F3
-02
-4C
-2C
-1C
-AE
-00
-02
-9D
-00
-D3
-CE
-F3
-02
-CA
-8A
-C6
-0E
-29
-1F
-C9
-04
-D0
-08
-8A
-E9
-0A
-AA
-A9
-15
-85
-0E
-A9
-5F
-9D
-00
-D3
-8E
-00
-02
-60
-C9
-03
-F0
-98
-C9
-0C
-D0
-09
-EC
-F7
-02
-F0
-CC
-B0
-CA
-B5
-13
-C9
-0A
-D0
-03
-20
-2D
-BF
-C9
-07
-D0
-3A
-20
-0D
-1D
-4C
-2C
-1C
-EC
-F7
-02
-B0
-2E
-CE
-F7
-02
-8E
-F3
-02
-AD
-00
-02
-48
-EC
-F7
-02
-F0
-0A
-B5
-14
-95
-13
-20
-4E
-02
-E8
-D0
-F1
-AE
-00
-02
-A9
-20
-9D
-00
-D3
-68
-AA
-A9
-5F
-9D
-00
-D3
-8E
-00
-02
-AE
-F3
-02
-60
-C9
-09
-D0
-59
-EC
-F7
-02
-B0
-51
-AD
-F7
-02
-C9
-47
-F0
-4A
-EE
-F7
-02
-8E
-F3
-02
-AD
-00
-02
-8D
-F2
-02
-98
-48
-A9
-20
-EC
-F7
-02
-F0
-1D
-B4
-13
-95
-13
-AD
-00
-02
-C9
-7A
-D0
-09
-38
-AD
-F2
-02
-E9
-20
-8D
-F2
-02
-B5
-13
-20
-4E
-02
-98
-E8
-D0
-DE
-AE
-00
-02
-A9
-20
-9D
-00
-D3
-68
-A8
-AE
-F2
-02
-A9
-5F
-9D
-00
-D3
-8E
-00
-02
-AE
-F3
-02
-4C
-2C
-1C
-C9
-05
-D0
-2E
-EC
-F7
-02
-F0
-F4
-B0
-F2
-B5
-13
-20
-4E
-02
-E8
-D0
-F1
-20
-00
-FD
-C9
-0F
-D0
-07
-EC
-F7
-02
-90
-F4
-B0
-10
-24
-64
-10
-0C
-C9
-0D
-F0
-08
-C9
-1B
-90
-E6
-C9
-7B
-B0
-E2
-60
-C9
-02
-D0
-1D
-E0
-00
-F0
-16
-8E
-F3
-02
-A9
-20
-EC
-F7
-02
-F0
-04
-B0
-0A
-B5
-13
-20
-C7
-1C
-AE
-F3
-02
-D0
-EA
-4C
-2C
-1C
-C9
-7F
-F0
-04
-C9
-9F
-D0
-1B
-E0
-00
-F0
-F1
-8E
-F3
-02
-A9
-20
-EC
-F7
-02
-F0
-04
-B0
-E5
-B5
-13
-20
-C7
-1C
-AE
-F3
-02
-4C
-07
-1D
-C9
-5F
-F0
-D6
-C9
-0D
-F0
-11
-60
-C9
-7F
-F0
-0B
-C9
-9F
-F0
-07
-C9
-20
-90
-03
-EE
-F7
-02
-60
-A9
-20
-8D
-01
-02
-A9
-0D
-20
-4E
-02
-A9
-0A
-20
-4E
-02
-A9
-00
-8D
-F7
-02
-8D
-F9
-02
-8E
-F3
-02
-A5
-00
-F0
-2B
-A2
-00
-8E
-F2
-02
-EC
-F3
-02
-F0
-21
-B5
-13
-C9
-22
-D0
-03
-EE
-F2
-02
-AD
-F2
-02
-4A
-B0
-0F
-B5
-13
-C9
-61
-90
-09
-C9
-7B
-B0
-05
-38
-E9
-20
-95
-13
-E8
-D0
-DA
-98
-48
-8A
-D0
-05
-68
-A8
-A9
-0D
-60
-A0
-F6
-A2
-00
-B5
-13
-E8
-C9
-20
-F0
-F9
-B9
-00
-1F
-F0
-17
-29
-7F
-D5
-12
-F0
-09
-B9
-00
-1F
-C8
-0A
-90
-F9
-B0
-E3
-B9
-00
-1F
-C8
-0A
-90
-DE
-88
-C0
-FE
-D0
-42
-A9
-00
-8D
-F4
-02
-8D
-F5
-02
-8D
-F6
-02
-20
-F0
-1E
-B0
-C0
-D0
-0E
-A0
-04
-2A
-2E
-F5
-02
-2E
-F6
-02
-88
-D0
-F6
-F0
-EB
-C9
-2C
-D0
-AC
-20
-F0
-1E
-90
-0C
-CE
-F8
-02
-68
-A8
-20
-9B
-02
-A9
-00
-AA
-60
-D0
-99
-A0
-04
-2A
-2E
-F4
-02
-88
-D0
-F9
-F0
-E2
-4C
-47
-1F
-EC
-F3
-02
-B0
-1C
-B5
-13
-E8
-C9
-20
-F0
-F4
-C9
-30
-90
-0E
-C9
-3A
-B0
-0A
-29
-0F
-0A
-0A
-0A
-0A
-A0
-00
-18
-60
-A0
-FF
-18
-60
-48
-29
-F0
-4A
-4A
-4A
-4A
-09
-30
-20
-3D
-1F
-68
-29
-0F
-09
-30
-20
-3D
-1F
-60
-48
-F8
-18
-AD
-F5
-02
-6D
-F4
-02
-8D
-F5
-02
-AD
-F6
-02
-69
-00
-8D
-F6
-02
-D8
-68
-95
-13
-E8
-20
-4E
-02
-EE
-F7
-02
-60
-C0
-F9
-D0
-75
-A0
-01
-8C
-F2
-02
-20
-F0
-1E
-B0
-0F
-D0
-35
-B5
-12
-AC
-F2
-02
-EE
-F2
-02
-99
-13
-00
-D0
-EC
-AC
-F2
-02
-88
-F0
-22
-A9
-99
-85
-13
-A9
-8F
-8D
-1A
-02
-A9
-1F
-8D
-1B
-02
-A9
-C3
-8D
-18
-02
-A9
-1F
-8D
-19
-02
-AE
-F2
-02
-A9
-00
-8D
-F2
-02
-85
-64
-4C
-7B
-1E
-C9
-20
-B0
-09
-48
-AD
-F2
-02
-D0
-3D
-68
-D0
-21
-8E
-F3
-02
-AE
-F2
-02
-E0
-47
-F0
-2C
-E0
-00
-D0
-0B
-C9
-20
-F0
-07
-48
-20
-C0
-02
-68
-D0
-05
-EE
-F2
-02
-95
-13
-AE
-F3
-02
-4C
-4E
-02
-4C
-E2
-1F
-20
-C0
-02
-AE
-F2
-02
-8E
-F7
-02
-CE
-F9
-02
-4C
-2C
-1C
-AE
-F3
-02
-48
-A9
-4D
-8D
-1A
-02
-A9
-02
-8D
-1B
-02
-68
-60
-AE
-F3
-02
-4C
-7B
-1E
-24
-24
-24
-24
-24
-24
-24
-24
-24
-24
-24
-24
-24
-24
-45
-44
-49
-D4
-41
-55
-54
-4F
-CC
-00
-.0222G
\ No newline at end of file
diff --git a/apps/c1p/6502/JP/LIFE.65V b/apps/c1p/6502/JP/LIFE.65V
deleted file mode 100644
index fd1f49eff..000000000
--- a/apps/c1p/6502/JP/LIFE.65V
+++ /dev/null
@@ -1 +0,0 @@
-.0000/A9
07
85
FF
A9
00
85
FE
A8
A2
19
91
FE
C8
D0
FB
E6
FF
CA
D0
F6
A9
20
A2
00
9D
00
D0
9D
00
D1
9D
00
D2
9D
00
D3
E8
D0
F1
A9
85
85
FE
A9
D0
85
FF
A9
25
85
FC
A9
D3
85
FD
A0
14
A9
80
91
FE
A9
87
91
FC
88
D0
F5
A2
14
A0
00
A5
FE
18
69
20
85
FE
90
02
E6
FF
A9
8F
91
FE
A0
15
A9
88
91
FE
CA
D0
E6
A9
07
85
FF
4C
71
05
EA
85
FD
85
FC
85
F9
85
F8
85
F7
85
F6
85
F0
A9
A6
85
A5
A9
D0
85
A6
A5
FF
85
9A
A5
FE
85
99
A5
FD
10
03
18
69
50
85
FB
A9
14
85
FA
A2
00
A4
FB
B9
40
0D
4A
90
04
A9
F0
B0
02
A9
2E
9D
26
D3
C8
C0
50
D0
02
A0
00
E8
A5
F0
4A
90
11
E0
14
F0
11
84
F5
8A
A8
A9
AB
91
A5
A4
F5
20
69
03
E0
14
D0
CF
A5
99
18
69
50
85
99
90
02
E6
9A
A9
20
C5
9A
D0
04
A9
07
85
9A
A5
A5
18
69
20
85
A5
90
02
E6
A6
C6
FA
D0
A7
4C
5F
02
82
.0222/00
01
00
0A
00
64
03
E8
27
10
00
00
00
00
A4
FA
91
F1
E6
FA
60
A0
00
38
A5
F3
FD
21
02
85
F5
CA
A5
F4
FD
21
02
90
0A
E8
C8
85
F4
A5
F5
85
F3
B0
E7
E8
98
09
30
20
30
02
CA
CA
D0
D9
60
A9
46
85
F1
A9
D3
85
F2
A2
08
A5
F8
85
F3
A5
F9
85
F4
A9
00
85
FA
20
37
02
A9
20
20
30
02
A9
28
20
30
02
4C
A1
02
48
30
04
A9
2B
10
02
A9
2D
20
30
02
68
10
05
18
49
FF
69
01
85
F3
A2
04
20
37
02
60
A9
00
85
F4
A5
FD
20
85
02
A9
2C
20
30
02
A5
FC
20
85
02
EA
A9
29
20
30
02
A9
20
20
30
02
A5
F6
85
F3
A5
F7
85
F4
A2
0A
20
37
02
4C
EC
02
C9
50
D0
05
EA
A9
00
F0
04
C9
B0
F0
F8
A0
10
CA
D0
FD
88
D0
FA
60
8D
00
DF
AD
00
DF
60
A9
7F
4C
57
05
C9
7F
D0
0C
E6
FD
A5
FD
20
CF
02
85
FD
4C
60
03
A9
7F
20
E5
02
C9
BF
D0
05
C6
FD
4C
F7
02
A9
7F
20
E5
02
C9
DF
D0
21
E6
FC
A5
FC
20
CF
02
85
FC
38
A5
FE
E9
50
85
FE
B0
02
C6
FF
A9
06
C5
FF
D0
04
A9
1F
85
FF
4C
60
03
A9
7F
20
E5
02
C9
EF
D0
33
C6
FC
A5
FC
20
CF
02
85
FC
18
A5
FE
69
50
85
FE
90
02
E6
FF
A9
20
C5
FF
D0
04
A9
07
85
FF
A9
7E
25
F0
85
F0
4C
77
00
A9
15
C6
F1
D0
FC
18
69
FF
D0
F7
60
A5
F0
0A
90
03
4C
8F
03
E0
C0
F0
04
A2
C0
86
F2
20
69
03
E6
F2
F0
EE
4C
EC
02
A5
F0
4A
4A
B0
09
A5
F0
09
02
85
F0
4C
AF
03
A9
FE
20
E5
02
C9
DE
F0
08
4C
9B
04
A5
FB
91
F1
60
A9
00
85
FA
A9
A6
85
F1
A9
D0
85
F2
A0
00
B1
F1
85
FB
A9
AB
91
F1
20
00
FD
C9
0A
D0
0C
A5
F0
49
01
85
F0
20
AA
03
4C
A7
03
C9
32
D0
0A
C0
13
F0
E5
20
AA
03
C8
D0
D7
C9
31
D0
0A
C0
00
F0
F0
20
AA
03
88
10
C9
C9
33
D0
18
A9
13
C5
FA
F0
EE
E6
FA
20
AA
03
18
A9
20
65
F1
85
F1
90
02
E6
F2
D0
D4
C9
34
D0
19
A9
00
C5
FA
F0
E2
C6
FA
20
AA
03
38
A5
F1
E9
20
85
F1
B0
02
C6
F2
4C
BD
03
C9
0D
D0
03
4C
D2
03
C9
50
D0
5C
A5
FE
85
F3
A5
FF
85
F4
A5
FA
85
F5
A9
00
C5
F5
F0
19
18
A5
F3
69
50
85
F3
90
02
E6
F4
A9
20
C5
F4
D0
04
A9
07
85
F4
C6
F5
D0
E7
A5
FD
10
03
18
69
50
84
FB
18
65
FB
C9
50
90
02
E9
50
8C
11
02
A8
AD
13
02
C9
50
D0
06
A9
03
A2
F0
D0
04
A9
00
A2
2E
91
F3
86
FB
AC
11
02
4C
C5
03
C9
4F
F0
A0
4C
C5
03
A9
07
85
F2
A9
00
85
F1
85
FA
A9
4E
85
F3
A9
4E
85
F4
A9
00
85
F5
A2
08
BC
68
05
B1
F1
4A
90
02
E6
F5
CA
D0
F3
A9
03
A0
51
D1
F1
D0
2C
A2
02
E4
F5
F0
0B
E8
E4
F5
F0
06
A9
01
91
F1
85
FA
E6
F1
D0
02
E6
F2
C6
F4
D0
CA
18
A5
F1
69
02
85
F1
90
02
E6
F2
C6
F3
D0
B7
F0
0A
A2
03
E4
F5
D0
DF
A9
02
D0
D7
A9
00
85
F9
85
F8
A9
06
85
F2
A9
FF
85
F1
A2
50
A0
50
B1
F1
C9
02
D0
06
A9
03
91
F1
D0
08
C9
01
D0
04
A9
00
91
F1
C9
03
D0
06
E6
F8
D0
02
E6
F9
88
D0
DF
18
A5
F1
69
50
85
F1
90
02
E6
F2
CA
D0
CF
A5
FA
C9
00
D0
03
4C
AF
03
E6
F6
D0
02
E6
F7
A5
F0
09
80
85
F0
4C
77
00
A0
FD
8C
00
DF
AC
00
DF
C0
EF
F0
F4
20
E5
02
4C
F1
02
00
01
02
50
52
A0
A1
A2
A9
4C
85
FE
A9
00
4C
69
00
EA
00
00
00
00
00
00
00
.0000G
\ No newline at end of file
diff --git a/apps/c1p/all.xml b/apps/c1p/all.xml
index 5a73adbfe..468a153b7 100644
--- a/apps/c1p/all.xml
+++ b/apps/c1p/all.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <serial id="serialPort" pos="left" padleft="8px">
 	<control type="list" binding="listSerial">
-		<item ref="/apps/c1p/6502/jeffpar/ASSEMBLER-1.json">6502 DISASSEMBLER-1 (JP)</item>
-		<item ref="/apps/c1p/6502/jeffpar/ASSEMBLER-2.json">6502 DISASSEMBLER-2 (JP)</item>
-		<item ref="/apps/c1p/6502/jeffpar/BASICEXT.json">6502 BASIC MODS (JP)</item>
-		<item ref="/apps/c1p/6502/jeffpar/LIFE.json">6502 LIFE (JP)</item>
+		<item ref="/apps/c1p/6502/jeffpar/assembler/ASSEMBLER-1.json">6502 DISASSEMBLER-1 (JP)</item>
+		<item ref="/apps/c1p/6502/jeffpar/assembler/ASSEMBLER-2.json">6502 DISASSEMBLER-2 (JP)</item>
+		<item ref="/apps/c1p/6502/jeffpar/basicext/BASICEXT.json">6502 BASIC MODS (JP)</item>
+		<item ref="/apps/c1p/6502/jeffpar/life/LIFE.json">6502 LIFE (JP)</item>
 		<item ref="/apps/c1p/6502/tests/bcd/bcd.json">6502 BCD TESTS</item>
 		<item ref="/apps/c1p/6502/tests/vflag/vflag.json">6502 VFLAG TESTS</item>
 		<item ref="/apps/c1p/BASIC/jeffpar/CHECKERS.BAS">CHECKERS (JP)</item>
diff --git a/modules/c1pjs/lib/serial.js b/modules/c1pjs/lib/serial.js
index 33e0cc3bf..35f66bc71 100644
--- a/modules/c1pjs/lib/serial.js
+++ b/modules/c1pjs/lib/serial.js
@@ -75,8 +75,8 @@ C1PSerialPort.prototype.reset = function()
         this.bInput = 0;
         this.cbInput = 0;
 
+        this.iInput = 0;
         this.sInput = "10 PRINT \"HELLO OSI #" + this.getMachineNum() + "\"\n";
-        this.iInputNext = 0;
 
      // this.sOutput = new Array(0);
      // this.iOutputNext = 0;
@@ -242,12 +242,12 @@ C1PSerialPort.prototype.loadFile = function(sFileName, sFileData, nResponse)
     }
 
     this.autoLoad = 0;
-    this.iInputNext = 0;
+    this.iInput = 0;
     this.sInput = sFileData;
 
     /*
      * The following code adds support for loading "65V" files encoded as JSON, which is a cleaner
-     * way to deliver those files when they contain binary (non-ASCII) data.
+     * way to store and deliver those files when they contain binary (non-ASCII) data.
      *
      * For example, my 6502 ASSEMBLER/DISASSEMBLER program starts with a conventional "65V" loading
      * sequence, which loads and launches a small program loader that loads the rest of the program
@@ -335,7 +335,7 @@ C1PSerialPort.prototype.getByte = function(addr, addrFrom)
              * An EVEN address implies they're looking, so if we have a fresh buffer,
              * then prime the pump.
              */
-            if (this.sInput && !this.iInputNext)
+            if (this.sInput && !this.iInput)
                 this.advanceInput();
         } else {
             /*
@@ -374,14 +374,16 @@ C1PSerialPort.prototype.advanceInput = function()
     if (this.sInput !== undefined) {
         this.bInput = 0;
         this.cbInput = 0;
-        if (this.iInputNext < this.sInput.length) {
-            var b = this.sInput.charCodeAt(this.iInputNext++) & 0xff;
+        if (this.iInput < this.sInput.length) {
+            var b = this.sInput.charCodeAt(this.iInput++) & 0xff;
             if (b == 0x0a) b = 0x0d;
             this.bInput = b;
             this.cbInput = 1;
             // if (DEBUG) this.log("advanceInput(" + str.toHexByte(b) + ")");
         }
         else {
+            this.sInput = "";
+            this.iInput = 0;
             if (DEBUG) this.log("advanceInput(): out of data");
             if (this.autoLoad == 1 && this.kbd) {
                 this.kbd.injectKeys(" \nRUN\n");