diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..29d5b52
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+cartridge.bin:
+	xa -W -C -v -O ASCII -c src/cartridge.xa -l cartridge.label -o cartridge.bin
+
+clean:
+	rm cartridge.bin cartridge.label
diff --git a/build.sh b/build.sh
deleted file mode 100755
index d9918b1..0000000
--- a/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xa -W -C -v -O ASCII -c src/cartridge.xa -l cartridge.label -o cartridge.bin
diff --git a/inc/applesoft.bin b/inc/applesoft.bin
deleted file mode 100644
index dbe55fa..0000000
Binary files a/inc/applesoft.bin and /dev/null differ
diff --git a/a1monitor2bin.py b/scripts/a1monitor2bin.py
similarity index 89%
rename from a1monitor2bin.py
rename to scripts/a1monitor2bin.py
index 2fabe65..0004ca5 100644
--- a/a1monitor2bin.py
+++ b/scripts/a1monitor2bin.py
@@ -1,6 +1,9 @@
 import codecs
 import sys
 
+"""
+This utility transforms A1 monitor format data to binary and outputs to STDOUT
+"""
 if __name__ == "__main__":
 
     byte_data = list()
diff --git a/bas2bin.py b/scripts/bas2bin.py
similarity index 91%
rename from bas2bin.py
rename to scripts/bas2bin.py
index 52454a3..aaab8e8 100644
--- a/bas2bin.py
+++ b/scripts/bas2bin.py
@@ -2,6 +2,10 @@ import codecs
 import binascii
 import sys
 
+"""
+This utility transforms CFFA formated BASIC programs to binary, outputting
+to file name with LOMEM & HIMEM appended
+"""
 if __name__ == "__main__":
 
     byte_data = list()
@@ -43,6 +47,3 @@ if __name__ == "__main__":
     with open(output_filename(sys.argv[1], byte_data[0:4]), 'wb') as output:
         for x in byte_data:
             output.write(x)
-
-# to visually compare
-# paste apple30th.txt <(hexdump -e '"%08.8_Ax\n"' -e '"%08.8_ax " 8/1 " %02x"' -e '"\n"' apple30th.bin)
diff --git a/bin2a1monitor.py b/scripts/bin2a1monitor.py
similarity index 87%
rename from bin2a1monitor.py
rename to scripts/bin2a1monitor.py
index 599bdd5..4935d9c 100644
--- a/bin2a1monitor.py
+++ b/scripts/bin2a1monitor.py
@@ -1,6 +1,10 @@
 import sys
 import binascii
 
+"""
+This utility transforms binary data to A1 monitor format, starting offset
+(in hex) is required.
+"""
 if __name__ == "__main__":
 
     if len(sys.argv) != 3:
diff --git a/src/rom_content.xa b/src/rom_content.xa
index b10f2aa..f7e567e 100644
--- a/src/rom_content.xa
+++ b/src/rom_content.xa
@@ -68,7 +68,7 @@ disassembler_jmp_addr   .word $FF1F
 
 applesoft
 applesoft_seg    .byt $01
-applesoft_len    .word $1F65
+applesoft_len    .word $1FFF
 applesoft_addr   .word $6000
 applesoft_cont_start  .word applesoft_cont
 applesoft_str .byt $15,"APPLESOFT BASIC 6000R"
@@ -92,5 +92,5 @@ basic_cont       .bin 0,0,"inc/basic.bin"
 apple30th_cont   .bin 0,0,"inc/apple30th.bin"
 memorytest_cont .bin 0,0,"inc/a1mt.bin"
 disassembler_cont .bin 0,0,"inc/disassembler.bin"
-applesoft_cont .bin 0,0,"inc/applesoft.bin"
+applesoft_cont .bin 0,0,"inc/applesoft-lite.bin"
 matrix_cont .bin 0,0,"inc/basic/matrix-0800-1000.bin"