diff --git a/2MB_215f.bin b/2MB_215f.bin
deleted file mode 100644
index 09a9de8..0000000
Binary files a/2MB_215f.bin and /dev/null differ
diff --git a/4950_215.bin b/4950_215.bin
deleted file mode 100644
index 2ca96fd..0000000
Binary files a/4950_215.bin and /dev/null differ
diff --git a/4950_92.bin b/4950_92.bin
deleted file mode 100644
index 0c159b3..0000000
Binary files a/4950_92.bin and /dev/null differ
diff --git a/49Gp_88.bin b/49Gp_88.bin
deleted file mode 100644
index 469a9b5..0000000
Binary files a/49Gp_88.bin and /dev/null differ
diff --git a/boot-49g+.bin b/boot-49g+.bin
deleted file mode 100644
index 2aa6736..0000000
Binary files a/boot-49g+.bin and /dev/null differ
diff --git a/boot-50g.bin b/boot-50g.bin
deleted file mode 100644
index 674556e..0000000
Binary files a/boot-50g.bin and /dev/null differ
diff --git a/boot.bin b/boot.bin
deleted file mode 100644
index 02659be..0000000
Binary files a/boot.bin and /dev/null differ
diff --git a/firmware/Placeholder b/firmware/Placeholder
new file mode 100644
index 0000000..73160aa
--- /dev/null
+++ b/firmware/Placeholder
@@ -0,0 +1 @@
+This folder will hold ROM binary files.
diff --git a/flash.c b/flash.c
index 09035cd..4667cb9 100644
--- a/flash.c
+++ b/flash.c
@@ -524,8 +524,8 @@ flash_load(x49gp_module_t *module, GKeyFile *key)
 		bootfd = x49gp_module_open_rodata(module,
 						  calc == UI_CALCULATOR_HP49GP ||
 						  calc == UI_CALCULATOR_HP49GP_NEWRPL ?
-						  "boot-49g+.bin" :
-						  "boot-50g.bin",
+                                                  "firmware/boot-49g+.bin" :
+                                                  "firmware/boot-50g.bin",
 						  &bootfile);
 
 		if (bootfd < 0) {
diff --git a/main.c b/main.c
index bd184ab..5e394aa 100644
--- a/main.c
+++ b/main.c
@@ -464,7 +464,7 @@ action_longopt(struct options *opt, struct option_def *match, char *this_opt,
 			return TRUE;
 		case '=':
 			(option_defs[i].action)(opt, option_defs + i, this_opt,
-						option_str+2, progname);
+                                                option_str+1, progname);
 			return TRUE;
 		}
 	}