diff --git a/inc/can.h b/inc/can.h
index 27a39d5..d62e69c 100644
--- a/inc/can.h
+++ b/inc/can.h
@@ -24,7 +24,7 @@ void can_disable(void);
 void can_set_bitrate(enum can_bitrate bitrate);
 void can_set_silent(uint8_t silent);
 uint32_t can_tx(CanTxMsgTypeDef *tx_msg);
-//uint32_t can_rx(CanRxMsgTypeDef *rx_msg, uint32_t timeout);
 uint8_t is_can_msg_pending(uint8_t fifo);
+CAN_HandleTypeDef* can_gethandle(void);
 
 #endif // _CAN_H
diff --git a/inc/led.h b/inc/led.h
index fd972a9..ab1a709 100644
--- a/inc/led.h
+++ b/inc/led.h
@@ -6,7 +6,7 @@
 #define LED_BLUE_Port GPIOB
 #define LED_BLUE LED_BLUE_Port , LED_BLUE_Pin
 
-#define LED_GREEN_Pin GPIO_PIN_1
+#define LED_GREEN_Pin GPIO_PIN_0
 #define LED_GREEN_Port GPIOB
 #define LED_GREEN LED_GREEN_Port , LED_GREEN_Pin
 
@@ -17,7 +17,7 @@
 void led_init();
 void led_blue_blink(uint8_t numblinks);
 void led_green_on(void);
-void led_green_of(void);
+void led_green_off(void);
 void led_blue_on(void);
 void led_process(void);
 
diff --git a/src/can.c b/src/can.c
index 8b22a9e..c5fe491 100644
--- a/src/can.c
+++ b/src/can.c
@@ -14,6 +14,9 @@ static CAN_FilterConfTypeDef filter;
 static uint32_t prescaler;
 enum can_bus_state bus_state;
 
+static CanRxMsgTypeDef can_rx_msg;
+static CanTxMsgTypeDef can_tx_msg;
+
 
 // Initialize CAN peripheral settings, but don't actually start the peripheral
 void can_init(void)
@@ -57,6 +60,10 @@ void can_enable(void)
 {
     if (bus_state == OFF_BUS)
     {
+
+    	HAL_NVIC_SetPriority(CEC_CAN_IRQn, 0, 0);
+    	HAL_NVIC_EnableIRQ(CEC_CAN_IRQn);
+
     	can_handle.Init.Prescaler = prescaler;
     	can_handle.Init.Mode = CAN_MODE_NORMAL;
     	can_handle.Init.SJW = CAN_SJW_1TQ;
@@ -68,13 +75,14 @@ void can_enable(void)
     	can_handle.Init.NART = DISABLE;
     	can_handle.Init.RFLM = DISABLE;
     	can_handle.Init.TXFP = DISABLE;
-    	can_handle.pTxMsg = NULL;
+    	can_handle.pTxMsg = &can_tx_msg;
+    	can_handle.pRxMsg = &can_rx_msg;
         HAL_CAN_Init(&can_handle);
         HAL_CAN_ConfigFilter(&can_handle, &filter);
         bus_state = ON_BUS;
 
-    	HAL_NVIC_SetPriority(CEC_CAN_IRQn, 1, 0);
-    	HAL_NVIC_EnableIRQ(CEC_CAN_IRQn);
+        led_blue_on();
+
     	HAL_CAN_Receive_IT(&can_handle, CAN_FIFO0);
 
     }
@@ -166,24 +174,24 @@ uint32_t can_tx(CanTxMsgTypeDef *tx_msg)
     can_handle.pTxMsg = tx_msg;
     status = HAL_CAN_Transmit_IT(&can_handle);
 
-	led_blue_on();
+	//led_blue_on();
     return status;
 }
 
 // CAN rxcomplete callback TODO: Move to interrupts?
-void HAL_CAN_RxCpltCallback(CAN_HandleTypeDef *hcan)
+void HAL_CAN_RxCpltCallback(CAN_HandleTypeDef* hcan)
 {
 	led_blue_on();
 
-	// TODO: Store this message in a buffer and defer CDC send to main loop
+//	// TODO: Store this message in a buffer and defer CDC send to main loop
 	CanRxMsgTypeDef* rxmsg = hcan->pRxMsg;
     uint8_t msg_buf[SLCAN_MTU];
 	uint32_t numbytes = slcan_parse_frame(msg_buf, rxmsg);
 	CDC_Transmit_FS(msg_buf, numbytes);
 
-    HAL_CAN_Receive_IT(&can_handle, CAN_FIFO0);
+	HAL_CAN_Receive_IT(hcan, CAN_FIFO0);
 }
-
+/*
 void HAL_CAN_TxCpltCallback(CAN_HandleTypeDef *hcan)
 {
 
@@ -193,7 +201,7 @@ void HAL_CAN_ErrorCallback(CAN_HandleTypeDef *hcan)
 {
     //error_assert(ERR_CANBUS);
 }
-
+*/
 
 // Check if a CAN message has been received and is waiting in the FIFO
 uint8_t is_can_msg_pending(uint8_t fifo)
diff --git a/src/interrupts.c b/src/interrupts.c
index 4e90d9f..8be947a 100644
--- a/src/interrupts.c
+++ b/src/interrupts.c
@@ -3,12 +3,12 @@
 //
 
 #include "stm32f0xx_hal.h"
-#include "stm32f0xx.h"
 #include "interrupts.h"
+#include "can.h"
+#include "led.h"
 
 extern PCD_HandleTypeDef hpcd_USB_FS;
 
-
 // Handle USB interrupts
 void USB_IRQHandler(void)
 {
@@ -27,5 +27,5 @@ void SysTick_Handler(void)
 // Handle CAN interrupts
 void CEC_CAN_IRQHandler(void)
 {
-  HAL_CAN_IRQHandler(can_gethandle());
+    HAL_CAN_IRQHandler(can_gethandle());
 }
diff --git a/src/led.c b/src/led.c
index 35c3d1a..5ac1bbc 100644
--- a/src/led.c
+++ b/src/led.c
@@ -5,7 +5,7 @@
 #include "stm32f0xx_hal.h"
 #include "led.h"
 
-static uint32_t led_laston = 0;
+static volatile uint32_t led_laston = 0;
 static uint32_t led_lastoff = 0;
 
 
diff --git a/src/slcan.c b/src/slcan.c
index 0544919..14c58b2 100644
--- a/src/slcan.c
+++ b/src/slcan.c
@@ -208,7 +208,7 @@ int8_t slcan_parse_str(uint8_t *buf, uint8_t len)
     }
 
     // send the message
-    can_tx(&frame, 10);
+    can_tx(&frame);
 
     return 0;
 }