diff --git a/include/arm9/crypto.h b/include/arm9/crypto.h
index 17f261d..151f866 100644
--- a/include/arm9/crypto.h
+++ b/include/arm9/crypto.h
@@ -60,6 +60,8 @@
 } AES_ctx;
 
 
+void AES_init(void);
+
 /**
  * @brief      Selects keyslot and sets the key for the specified key type.
  *
diff --git a/include/arm9/timer.h b/include/arm9/timer.h
index 85e7bcc..d6f6607 100644
--- a/include/arm9/timer.h
+++ b/include/arm9/timer.h
@@ -42,13 +42,13 @@
 /**
  * @brief      Starts a timer.
  *
- * @param[in]  timer       The timer to start.
- * @param[in]  prescaler   The prescaler to use.
- * @param[in]  ticks       The initial number of ticks. This is also the reload
- *                         value on overflow.
- * @param[in]  irqHandler  The IRQ handler function for this timer. NULL to disable IRQ.
+ * @param[in]  timer      The timer to start.
+ * @param[in]  prescaler  The prescaler to use.
+ * @param[in]  ticks      The initial number of ticks. This is also the reload
+ *                        value on overflow.
+ * @param[in]  enableIrq  Timer fires IRQs if true.
  */
-void TIMER_start(Timer timer, TimerPrescaler prescaler, u16 ticks, void (*irqHandler)(void));
+void TIMER_start(Timer timer, TimerPrescaler prescaler, u16 ticks, bool enableIrq);
 
 /**
  * @brief      Stops a timer.
diff --git a/source/arm9/crypto.c b/source/arm9/crypto.c
index 0e2507e..345b84f 100644
--- a/source/arm9/crypto.c
+++ b/source/arm9/crypto.c
@@ -50,6 +50,26 @@
 #define REG_AESKEYYFIFO   ((vu32*)(AES_REGS_BASE + 0x108))
 
 
+void AES_init(void)
+{
+	REG_AESCNT = AES_MAC_SIZE(4) | AES_FLUSH_WRITE_FIFO | AES_FLUSH_READ_FIFO;
+	*((vu8*)0x10000008) |= 0xCu; // ??
+
+	//REG_NDMA0_CNT = 0;
+	REG_NDMA0_DST_ADDR = (u32)REG_AESWRFIFO;
+	REG_NDMA0_BLOCK_CNT = NDMA_BLOCK_SYS_FREQ;
+	REG_NDMA0_CNT = NDMA_REPEATING_MODE | NDMA_STARTUP_AES_IN |
+	                NDMA_SRC_UPDATE_INC | NDMA_DST_UPDATE_FIXED;
+
+	//REG_NDMA1_CNT = 0;
+	REG_NDMA1_SRC_ADDR = (u32)REG_AESRDFIFO;
+	REG_NDMA1_BLOCK_CNT = NDMA_BLOCK_SYS_FREQ;
+	REG_NDMA1_CNT = NDMA_REPEATING_MODE | NDMA_STARTUP_AES_OUT |
+	                NDMA_SRC_UPDATE_FIXED | NDMA_DST_UPDATE_INC;
+
+	REG_IRQ_IE |= 1u<<IRQ_AES;
+}
+
 // TODO: Handle endianess!
 static void addCounter(u32 *restrict ctr, u32 val)
 {
@@ -146,21 +166,13 @@
 
 static void setupNdma(const u32 *restrict in, u32 *restrict out, u32 wordCount, u32 burstSize)
 {
-	REG_NDMA0_CNT = 0;
 	REG_NDMA0_SRC_ADDR = (u32)in;
-	REG_NDMA0_DST_ADDR = (u32)REG_AESWRFIFO;
 	REG_NDMA0_WRITE_CNT = wordCount;
-	REG_NDMA0_BLOCK_CNT = NDMA_BLOCK_SYS_FREQ;
-	REG_NDMA0_CNT = NDMA_ENABLE | NDMA_REPEATING_MODE | burstSize | NDMA_STARTUP_AES_IN |
-	                NDMA_SRC_UPDATE_INC | NDMA_DST_UPDATE_FIXED;
+	REG_NDMA0_CNT = (REG_NDMA0_CNT & 0xFFF0FFFFu) | NDMA_ENABLE | burstSize;
 
-	REG_NDMA1_CNT = 0;
-	REG_NDMA1_SRC_ADDR = (u32)REG_AESRDFIFO;
 	REG_NDMA1_DST_ADDR = (u32)out;
 	REG_NDMA1_WRITE_CNT = wordCount;
-	REG_NDMA1_BLOCK_CNT = NDMA_BLOCK_SYS_FREQ;
-	REG_NDMA1_CNT = NDMA_ENABLE | NDMA_REPEATING_MODE | burstSize | NDMA_STARTUP_AES_OUT |
-	                NDMA_SRC_UPDATE_FIXED | NDMA_DST_UPDATE_INC;
+	REG_NDMA1_CNT = (REG_NDMA1_CNT & 0xFFF0FFFFu) | NDMA_ENABLE | burstSize;
 }
 
 void AES_crypt(AES_ctx *restrict ctx, const u32 *restrict in, u32 *restrict out, u32 size)
@@ -251,7 +263,8 @@
 	}
 
 	// Disable the NDMA channels
-	REG_NDMA1_CNT = REG_NDMA0_CNT = 0;
+	REG_NDMA0_CNT = (REG_NDMA0_CNT<<1)>>1;
+	REG_NDMA1_CNT = (REG_NDMA1_CNT<<1)>>1;
 
 	// Throw possibly cached lines out of the window
 	invalidateDCacheRange(savedOut, size);
diff --git a/source/arm9/interrupt.c b/source/arm9/interrupt.c
index a5a7dbd..0928899 100644
--- a/source/arm9/interrupt.c
+++ b/source/arm9/interrupt.c
@@ -8,8 +8,8 @@
 
 void IRQ_init(void)
 {
-	// Atomic IRQ disable and aknowledge
-	__asm__ __volatile__("stm %0, {%1, %2}" : : "r" (&REG_IRQ_IE), "r" (0u), "r" (0xFFFFFFFFu) : "memory");
+	REG_IRQ_IE = 0;
+	REG_IRQ_IF = 0xFFFFFFFFu;
 
 	for(u32 i = 0; i < 32; i++)
 	{
@@ -22,7 +22,7 @@
 void IRQ_registerHandler(Interrupt num, void (*irqHandler)(void))
 {
 	irqHandlerTable[num] = irqHandler;
-	REG_IRQ_IE |= (1u<<num);
+	REG_IRQ_IE |= 1u<<num;
 }
 
 void IRQ_unregisterHandler(Interrupt num)
diff --git a/source/arm9/loader_init.c b/source/arm9/loader_init.c
index 7891104..d91418a 100644
--- a/source/arm9/loader_init.c
+++ b/source/arm9/loader_init.c
@@ -3,6 +3,7 @@
 #include "arm9/ndma.h"
 #include "arm9/timer.h"
 #include "pxi.h"
+#include "arm9/crypto.h"
 
 
 
@@ -12,4 +13,5 @@
 	NDMA_init();
 	TIMER_init();
 	PXI_init();
+	AES_init();
 }
diff --git a/source/arm9/menu.c b/source/arm9/menu.c
index 62bf108..73579c2 100644
--- a/source/arm9/menu.c
+++ b/source/arm9/menu.c
@@ -88,7 +88,7 @@
 	uiClearConsoles();
 	uiDrawConsoleWindow();
 
-	TIMER_start(TIMER_0, TIMER_PRESCALER_64, TIMER_FREQ_64(60.0f), NULL);
+	//TIMER_start(TIMER_0, TIMER_PRESCALER_64, TIMER_FREQ_64(60.0f), true);
 
 	// caller requested to enter a submenu?
 	if(initial_state != MENU_STATE_MAIN)
@@ -223,7 +223,7 @@
 	}
 
 exitAndLaunchFirm:
-	TIMER_stop(TIMER_0);
+	//TIMER_stop(TIMER_0);
 
 	return 0;
 }
diff --git a/source/arm9/ndma.c b/source/arm9/ndma.c
index fa8b68e..a4833cb 100644
--- a/source/arm9/ndma.c
+++ b/source/arm9/ndma.c
@@ -21,8 +21,7 @@
 
 	REG_NDMA_GLOBAL_CNT = NDMA_ROUND_ROBIN(32);
 
-	REG_IRQ_IE |= ((1u<<IRQ_DMAC_1_0) | (1u<<IRQ_DMAC_1_1) | (1u<<IRQ_DMAC_1_2) | (1u<<IRQ_DMAC_1_3) |
-	               (1u<<IRQ_DMAC_1_4) | (1u<<IRQ_DMAC_1_5) | (1u<<IRQ_DMAC_1_6) | (1u<<IRQ_DMAC_1_7));
+	REG_IRQ_IE |= 1u<<IRQ_DMAC_1_7;
 
 	leaveCriticalSection(oldState);
 }
diff --git a/source/arm9/pxi.c b/source/arm9/pxi.c
index 9357e52..25ed9e0 100644
--- a/source/arm9/pxi.c
+++ b/source/arm9/pxi.c
@@ -14,7 +14,7 @@
 	REG_PXI_SYNC9 |= 9u<<8;
 	while((REG_PXI_SYNC9 & 0xFFu) != 11u);
 
-	REG_IRQ_IE |= ((1u<<IRQ_PXI_SYNC) | (1u<<IRQ_PXI_NOT_FULL) | (1u<<IRQ_PXI_NOT_EMPTY));
+	REG_IRQ_IE |= 1u<<IRQ_PXI_SYNC;
 
 	leaveCriticalSection(oldState);
 }
diff --git a/source/arm9/timer.c b/source/arm9/timer.c
index 58bc3af..0245d5a 100644
--- a/source/arm9/timer.c
+++ b/source/arm9/timer.c
@@ -35,23 +35,15 @@
 		REG_TIMER_CNT(i) = 0;
 	}
 
-	REG_IRQ_IE |= ((1u<<IRQ_TIMER_0) | (1u<<IRQ_TIMER_1) | (1u<<IRQ_TIMER_2) | (1u<<IRQ_TIMER_3));
+	REG_IRQ_IE |= 1u<<IRQ_TIMER_3;
 
 	leaveCriticalSection(oldState);
 }
 
-void TIMER_start(Timer timer, TimerPrescaler prescaler, u16 ticks, void (*irqHandler)(void))
+void TIMER_start(Timer timer, TimerPrescaler prescaler, u16 ticks, bool enableIrq)
 {
-	u16 irq = 0;
-
-	if(irqHandler)
-	{
-		IRQ_registerHandler(IRQ_TIMER_0 + timer, irqHandler);
-		irq = TIMER_IRQ_ENABLE;
-	}
-
 	REG_TIMER_VAL(timer) = ticks;
-	REG_TIMER_CNT(timer) = TIMER_ENABLE | irq | prescaler;
+	REG_TIMER_CNT(timer) = TIMER_ENABLE | (enableIrq ? TIMER_IRQ_ENABLE : 0) | prescaler;
 }
 
 void TIMER_stop(Timer timer)