diff --git a/Inc/stm32f0xx_it.h b/Inc/stm32f0xx_it.h
index 7dd63b1..752f976 100644
--- a/Inc/stm32f0xx_it.h
+++ b/Inc/stm32f0xx_it.h
@@ -47,8 +47,6 @@
 /* Exported macro ------------------------------------------------------------*/
 /* Exported functions ------------------------------------------------------- */
 
-void NMI_Handler(void);
-void HardFault_Handler(void);
 void SysTick_Handler(void);
 void TIM1_BRK_UP_TRG_COM_IRQHandler(void);
 
diff --git a/Makefile b/Makefile
index cf4e544..be76152 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 ##########################################################################################################################
-# File automatically-generated by tool: [projectgenerator] version: [2.26.0] date: [Sat Dec 16 17:35:32 CET 2017]
+# File automatically-generated by tool: [projectgenerator] version: [2.26.0] date: [Sat Dec 16 19:07:12 CET 2017] 
 ##########################################################################################################################
 
 # ------------------------------------------------
@@ -89,7 +89,7 @@ Src/stm32f0xx_hal_msp.c \
 Src/stm32f0xx_hal_timebase_TIM.c \
 Src/stm32f0xx_it.c \
 Src/system_stm32f0xx.c \
-Src/main.c  
+Src/main.c
 
 C_SOURCES += $(foreach sdir,$(GEX_SRC_DIR),$(wildcard $(sdir)/*.c)) $(GEX_SOURCES)
 
@@ -150,7 +150,6 @@ AS_INCLUDES =  \
 # C includes
 C_INCLUDES =  \
 -IInc \
-$(GEX_INCLUDES) \
 -IDrivers/STM32F0xx_HAL_Driver/Inc \
 -IDrivers/STM32F0xx_HAL_Driver/Inc/Legacy \
 -IMiddlewares/Third_Party/FreeRTOS/Source/portable/GCC/ARM_CM0 \
@@ -159,6 +158,7 @@ $(GEX_INCLUDES) \
 -IMiddlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS \
 -IDrivers/CMSIS/Include
 
+C_INCLUDES += $(GEX_INCLUDES)
 
 # compile gcc flags
 ASFLAGS = $(MCU) $(AS_DEFS) $(AS_INCLUDES) $(OPT) -Wall -fdata-sections -ffunction-sections
diff --git a/Src/stm32f0xx_it.c b/Src/stm32f0xx_it.c
index 91ab370..a988db2 100644
--- a/Src/stm32f0xx_it.c
+++ b/Src/stm32f0xx_it.c
@@ -48,35 +48,6 @@ extern TIM_HandleTypeDef htim1;
 /*            Cortex-M0 Processor Interruption and Exception Handlers         */ 
 /******************************************************************************/
 
-/**
-* @brief This function handles Non maskable interrupt.
-*/
-void NMI_Handler(void)
-{
-  /* USER CODE BEGIN NonMaskableInt_IRQn 0 */
-
-  /* USER CODE END NonMaskableInt_IRQn 0 */
-  /* USER CODE BEGIN NonMaskableInt_IRQn 1 */
-
-  /* USER CODE END NonMaskableInt_IRQn 1 */
-}
-
-/**
-* @brief This function handles Hard fault interrupt.
-*/
-void HardFault_Handler(void)
-{
-  /* USER CODE BEGIN HardFault_IRQn 0 */
-
-  /* USER CODE END HardFault_IRQn 0 */
-  while (1)
-  {
-  }
-  /* USER CODE BEGIN HardFault_IRQn 1 */
-
-  /* USER CODE END HardFault_IRQn 1 */
-}
-
 /**
 * @brief This function handles System tick timer.
 */
diff --git a/gex-f072.ioc b/gex-f072.ioc
index 472f5b1..46b3535 100644
--- a/gex-f072.ioc
+++ b/gex-f072.ioc
@@ -15,15 +15,17 @@ Mcu.Package=LQFP64
 Mcu.Pin0=PF0-OSC_IN
 Mcu.Pin1=PA11
 Mcu.Pin2=PA12
-Mcu.Pin3=VP_FREERTOS_VS_ENABLE
-Mcu.Pin4=VP_SYS_VS_tim1
-Mcu.PinsNb=5
+Mcu.Pin3=PA13
+Mcu.Pin4=PA14
+Mcu.Pin5=VP_FREERTOS_VS_ENABLE
+Mcu.Pin6=VP_SYS_VS_tim1
+Mcu.PinsNb=7
 Mcu.UserConstants=
 Mcu.UserName=STM32F072RBTx
 MxCube.Version=4.23.0
 MxDb.Version=DB.4.0.230
-NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false
-NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false
+NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:false\:false\:false
+NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:false\:false\:false
 NVIC.PendSV_IRQn=true\:3\:0\:false\:false\:false\:true\:false
 NVIC.SVC_IRQn=true\:0\:0\:false\:false\:false\:false\:false
 NVIC.SysTick_IRQn=true\:3\:0\:false\:false\:true\:true\:false
@@ -34,6 +36,10 @@ PA11.Mode=Device
 PA11.Signal=USB_DM
 PA12.Mode=Device
 PA12.Signal=USB_DP
+PA13.Mode=Serial_Wire
+PA13.Signal=SYS_SWDIO
+PA14.Mode=Serial_Wire
+PA14.Signal=SYS_SWCLK
 PCC.Checker=false
 PCC.Line=STM32F0x2
 PCC.MCU=STM32F072R(8-B)Tx