diff --git a/FSHa.asm b/FSHa.asm
index 6f75afd..dc6001c 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -28,7 +28,7 @@ Input:
  CALL _NewLine
 
 Decode:
- LD   HL, FshCmdOP ; resets to 0, TEMP
+ LD   HL, FshCmdOP ; resets op to 0, TEMP
  LD   A, $00
  LD   (HL), A
 
@@ -56,7 +56,6 @@ Exit:
  RET
 
 PS1: .DB "FSH> ",0
-;TestStr: .DB "081",0
 FshFlags: .DB %00000000
 ; 0: Debug Flag
 ; 1: Error Flag
@@ -71,6 +70,5 @@ FshFlags: .DB %00000000
 #include "includes/Char.asm"
 #include "includes/Cursor.asm"
 #include "includes/Input.asm"
-#include "includes/bbuffer.asm"
 #include "includes/Err.asm"
 .end
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 72fcf38..3edf073 100644
Binary files a/bin/FSHa.8xp and b/bin/FSHa.8xp differ
diff --git a/includes/Byte.asm b/includes/Byte.asm
index fe693ab..51f45db 100644
--- a/includes/Byte.asm
+++ b/includes/Byte.asm
@@ -1,8 +1,8 @@
 ;; bytecmp [Bytes]
 ;;  Determines if two bytes are equal.
 ;; Inputs:
-;;  HL: String pointer
-;;  DE: String pointer
+;;  HL: Byte pointer
+;;  DE: Byte pointer
 ;; Outputs:
 ;;  Z: Set if equal, reset if not equal
 bytecmp:
diff --git a/includes/Char.asm b/includes/Char.asm
index 970378f..1e0a350 100644
--- a/includes/Char.asm
+++ b/includes/Char.asm
@@ -47,4 +47,3 @@ charnumsymtoascii:
  ld a, (hl)
  pop hl
  ret
-
diff --git a/includes/bbuffer.asm b/includes/bbuffer.asm
deleted file mode 100644
index b2ce8ca..0000000
--- a/includes/bbuffer.asm
+++ /dev/null
@@ -1,4 +0,0 @@
-;; THIS FILE HOLDS SMALL (byte) BUFFERS
-;; DONT TOUCH
-CurColBuf:
- .DB $00
diff --git a/includes/define.inc b/includes/define.inc
index ba05cb2..4274022 100644
--- a/includes/define.inc
+++ b/includes/define.inc
@@ -8,7 +8,7 @@
 #define END .end
 
 #define FshVarsSize 128      ;256 bytes   | 64 words
-#define FshCmdSize 16        ;16 bytes    | 8 chars | 8 meta
+#define FshCmdSize 17        ;17 bytes    | 8 chars | 1 null, 4 words
 #define FshCmdInptSize 8     ;8 bytes     | 8 chars
 #define FshPrgmSize 1024     ;1024 bytes  | max size
 
@@ -17,9 +17,9 @@ FshVars       equ RamVars
 FshCmd        equ FshVars + FshVarsSize
 FshPrgm       equ FshCmd + FshCmdSize
 
-FshCmdMeta    equ FshCmd  + FshCmdInptSize
-FshCmdOP      equ FshCmdMeta + 1
-FshCmdArg1    equ FshCmdMeta + 2
-FshCmdArg2    equ FshCmdMeta + 3
-FshCmdArg3    equ FshCmdMeta + 4
-FshCmdArg4    equ FshCmdMeta + 5
+FshCmdNull    equ FshCmd  + FshCmdInptSize
+FshCmdOP      equ FshCmdNull + 1
+FshCmdArg1    equ FshCmdNull + 2
+FshCmdArg2    equ FshCmdNull + 4
+FshCmdArg3    equ FshCmdNull + 6
+FshCmdArg4    equ FshCmdNull + 8