diff --git a/bootrom/bootrom.c b/bootrom/bootrom.c
index 6aa7e0a1e..c53f2bfc1 100644
--- a/bootrom/bootrom.c
+++ b/bootrom/bootrom.c
@@ -55,7 +55,7 @@ static void ConfigClocks(void) {
     // PLL output is MAINCK * multiplier / divisor = 16Mhz * 12 / 2 = 96Mhz
     AT91C_BASE_PMC->PMC_PLLR =
     	PMC_PLL_DIVISOR(2) |
-		PMC_PLL_COUNT_BEFORE_LOCK(0x50) |
+		PMC_PLL_COUNT_BEFORE_LOCK(0x10) |
 		PMC_PLL_FREQUENCY_RANGE(0) |
 		PMC_PLL_MULTIPLIER(12) |
 		PMC_PLL_USB_DIVISOR(1);
diff --git a/include/proxmark3.h b/include/proxmark3.h
index 05b5885b6..3d3800ccd 100644
--- a/include/proxmark3.h
+++ b/include/proxmark3.h
@@ -18,37 +18,37 @@
 
 #define WDT_HIT()								AT91C_BASE_WDTC->WDTC_WDCR = 0xa5000001
 
-#define PWM_CH_MODE_PRESCALER(x)				((x)<<0)
-#define PWM_CHANNEL(x)							(1<<(x))
+#define PWM_CH_MODE_PRESCALER(x)				((x) << 0)
+#define PWM_CHANNEL(x)							(1 << (x))
 
 #define ADC_CHAN_LF								4
 #define ADC_CHAN_HF								5
-#define ADC_MODE_PRESCALE(x)					((x)<<8)
-#define ADC_MODE_STARTUP_TIME(x)				((x)<<16)
-#define ADC_MODE_SAMPLE_HOLD_TIME(x)			((x)<<24)
-#define ADC_CHANNEL(x)							(1<<(x))
-#define ADC_END_OF_CONVERSION(x)				(1<<(x))
+#define ADC_MODE_PRESCALE(x)					((x) << 8)
+#define ADC_MODE_STARTUP_TIME(x)				((x) << 16)
+#define ADC_MODE_SAMPLE_HOLD_TIME(x)			((x) << 24)
+#define ADC_CHANNEL(x)							(1 << (x))
+#define ADC_END_OF_CONVERSION(x)				(1 << (x))
 
-#define SSC_CLOCK_MODE_START(x)					((x)<<8)
-#define SSC_FRAME_MODE_WORDS_PER_TRANSFER(x)	((x)<<8)
-#define SSC_CLOCK_MODE_SELECT(x)				((x)<<0)
-#define SSC_FRAME_MODE_BITS_IN_WORD(x)			(((x)-1)<<0)
+#define SSC_CLOCK_MODE_START(x)					((x) << 8)
+#define SSC_FRAME_MODE_WORDS_PER_TRANSFER(x)	((x) << 8)
+#define SSC_CLOCK_MODE_SELECT(x)				((x) << 0)
+#define SSC_FRAME_MODE_BITS_IN_WORD(x)			(((x)-1) << 0)
 
-#define MC_FLASH_COMMAND_KEY					((0x5a)<<24)
-#define MC_FLASH_MODE_FLASH_WAIT_STATES(x)		((x)<<8)
-#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)		(((x)+((x)/2))<<16)
-#define MC_FLASH_COMMAND_PAGEN(x)				((x)<<8)
+#define MC_FLASH_COMMAND_KEY					((0x5a) << 24)
+#define MC_FLASH_MODE_FLASH_WAIT_STATES(x)		((x) << 8)
+#define MC_FLASH_MODE_MASTER_CLK_IN_MHZ(x)		(((x)+((x)/2)) << 16)
+#define MC_FLASH_COMMAND_PAGEN(x)				((x) << 8)
 
-#define RST_CONTROL_KEY							(0xa5<<24)
+#define RST_CONTROL_KEY							(0xa5 << 24)
 
-#define PMC_MAIN_OSC_STARTUP_DELAY(x)			((x)<<8)
+#define PMC_MAIN_OSC_STARTUP_DELAY(x)			((x) << 8)
 #define PMC_PLL_DIVISOR(x)						(x)
-#define PMC_PLL_MULTIPLIER(x)					(((x)-1)<<16)
-#define PMC_PLL_COUNT_BEFORE_LOCK(x)			((x)<<8)
-#define PMC_PLL_FREQUENCY_RANGE(x)				((x)<<14)
-#define PMC_PLL_USB_DIVISOR(x)					((x)<<28)
+#define PMC_PLL_MULTIPLIER(x)					(((x)-1) << 16)
+#define PMC_PLL_COUNT_BEFORE_LOCK(x)			(((x) & 0x3F) << 8)		// 6bit register 0011 1111
+#define PMC_PLL_FREQUENCY_RANGE(x)				(((x) & 0x3) << 14)		// 2bit register
+#define PMC_PLL_USB_DIVISOR(x)					((x) << 28)
 
-#define UDP_INTERRUPT_ENDPOINT(x)				(1<<(x))
+#define UDP_INTERRUPT_ENDPOINT(x)				(1 << (x))
 #define UDP_CSR_BYTES_RECEIVED(x)				(((x) >> 16) & 0x7ff)
 //**************************************************************