diff --git a/bootloader/clubdance_v2_bootloader.X/nbproject/configurations.xml b/bootloader/clubdance_v2_bootloader.X/nbproject/configurations.xml
index 54dcad0..beaeb37 100644
--- a/bootloader/clubdance_v2_bootloader.X/nbproject/configurations.xml
+++ b/bootloader/clubdance_v2_bootloader.X/nbproject/configurations.xml
@@ -90,7 +90,7 @@
         <property key="default-bitfield-type" value="true"/>
         <property key="default-char-type" value="true"/>
         <property key="define-macros" value=""/>
-        <property key="disable-optimizations" value="true"/>
+        <property key="disable-optimizations" value="false"/>
         <property key="extra-include-directories"
                   value="..\src;..\..\common_src;..\src\minimal_usb_driver"/>
         <property key="favor-optimization-for" value="-speed,+space"/>
@@ -105,7 +105,7 @@
         <property key="optimization-debug" value="false"/>
         <property key="optimization-invariant-enable" value="false"/>
         <property key="optimization-invariant-value" value="16"/>
-        <property key="optimization-level" value="-O0"/>
+        <property key="optimization-level" value="-O1"/>
         <property key="optimization-speed" value="false"/>
         <property key="optimization-stable-enable" value="false"/>
         <property key="pack-struct" value="true"/>
@@ -172,7 +172,6 @@
                   value="Press to browse for a specific firmware version"/>
         <property key="ToolFirmwareOption.UseLatestFirmware" value="true"/>
         <property key="debugoptions.useswbreakpoints" value="false"/>
-        <property key="firmware.download.all" value="false"/>
         <property key="hwtoolclock.frcindebug" value="false"/>
         <property key="memories.aux" value="false"/>
         <property key="memories.bootflash" value="true"/>
diff --git a/bootloader/src/main.c b/bootloader/src/main.c
index ca4f5a7..5426e81 100644
--- a/bootloader/src/main.c
+++ b/bootloader/src/main.c
@@ -16,14 +16,13 @@ void BootMain(void);
 void InitializeSystem(void);
 
 const unsigned int FlashSignatureWord __at(APP_SIGNATURE_ADDRESS) = APP_SIGNATURE_VALUE;
-//const unsigned int FlashSignatureWord __at(APP_SIGNATURE_ADDRESS) = APP_SIGNATURE_VALUE;
 
 void main(void)
 {
-    //BootMain();
     /**
      * TODO: implement hardware IO-based method for forcing entry into bootloader
      */
+     goto DoFlashSignatureCheck;
     
     // normal operation: verify the firmware signature is valid. if it isn't enter
     // bootloader (fw update) mode so valid firmware can be flashed
diff --git a/common_src/memory.h b/common_src/memory.h
index 6bdd7a9..ac9bd80 100644
--- a/common_src/memory.h
+++ b/common_src/memory.h
@@ -35,7 +35,7 @@
  *                              LoVector goto -> APP_FW_MEMORY_OFFSET + 0x18
  *          Configuration > Linker > Memory Model > ROM space -> default,-APP_FW_MEMORY_OFFSET-7FFF
  *      In application project:
- *          
+ *          Configuration > Linker > Memory Model > ROM space -> default,-0-[[APP_FW_MEMORY_OFFSET-1]],-[[APP_FW_MEMORY_OFFSET+6]]-[[APP_FW_MEMORY_OFFSET+7]],-[[APP_FW_MEMORY_OFFSET+0x16]]-[[APP_FW_MEMORY_OFFSET+0x17]]
  */
 
 /**