diff --git a/src/HID-APIs/TeensyKeyboardAPI.h b/src/HID-APIs/TeensyKeyboardAPI.h
index 0e630b3..9282dc4 100644
--- a/src/HID-APIs/TeensyKeyboardAPI.h
+++ b/src/HID-APIs/TeensyKeyboardAPI.h
@@ -55,8 +55,9 @@ static const uint8_t PROGMEM teensykeyboard_hid_report_desc[] = {
 	0x09, 0xB6,		//  Usage (Scan Previous Track),
 	0x09, 0xB7,		//  Usage (Stop),
 	0x09, 0xB8,		//  Usage (Eject),
-// Note: Teensy ledreport was not modified to 8 bit, nor left out when leds are deactivated
         0x81, 0x02,             //  Input (Data, Variable, Absolute), ;Media keys
+        
+        // Note: Teensy ledreport was not modified to 8 bit, nor left out when leds are deactivated
         0x95, 0x05,             //  Report Count (5),
         0x75, 0x01,             //  Report Size (1),
         0x05, 0x08,             //  Usage Page (LEDs),
diff --git a/src/MultiReport/ImprovedKeyboard.cpp b/src/MultiReport/ImprovedKeyboard.cpp
index a4d5fc3..9f4ef20 100644
--- a/src/MultiReport/ImprovedKeyboard.cpp
+++ b/src/MultiReport/ImprovedKeyboard.cpp
@@ -50,7 +50,6 @@ static const uint8_t _hidMultiReportDescriptorKeyboard[] PROGMEM = {
     0x75, 0x08,                      /*   REPORT_SIZE (8) */
     0x15, 0x00,                      /*   LOGICAL_MINIMUM (0) */
     0x26, 0xE7, 0x00,                /*   LOGICAL_MAXIMUM (231) */
-    0x05, 0x07,                      /*   USAGE_PAGE (Keyboard) */
     0x19, 0x00,                      /*   USAGE_MINIMUM (Reserved (no event indicated)) */
     0x29, 0xE7,                      /*   USAGE_MAXIMUM (Keyboard Right GUI) */
     0x81, 0x00,                      /*   INPUT (Data,Ary,Abs) */
diff --git a/src/MultiReport/NKROKeyboard.cpp b/src/MultiReport/NKROKeyboard.cpp
index 5e341f9..4accc87 100644
--- a/src/MultiReport/NKROKeyboard.cpp
+++ b/src/MultiReport/NKROKeyboard.cpp
@@ -41,7 +41,6 @@ static const uint8_t _hidMultiReportDescriptorNKROKeyboard[] PROGMEM = {
     0x81, 0x02,                      /*   INPUT (Data,Var,Abs) */
 
 	/* 104 Keys as bitmap */
-	0x05, 0x07,						/*   Usage Page (Key Codes) TODO needed?*/
 	0x19, 0x00,						/*   Usage Minimum (0) */
 	0x29, NKRO_KEY_COUNT - 1,		/*   Usage Maximum (103) */
 	0x15, 0x00,						/*   Logical Minimum (0) */
@@ -55,7 +54,6 @@ static const uint8_t _hidMultiReportDescriptorNKROKeyboard[] PROGMEM = {
     0x75, 0x08,                      /*   REPORT_SIZE (8) */
     0x15, 0x00,                      /*   LOGICAL_MINIMUM (0) */
     0x26, 0xE7, 0x00,                /*   LOGICAL_MAXIMUM (231) */
-    /*0x05, 0x07,                         USAGE_PAGE (Keyboard) TODO */
     0x19, 0x00,                      /*   USAGE_MINIMUM (Reserved (no event indicated)) */
     0x29, 0xE7,                      /*   USAGE_MAXIMUM (Keyboard Right GUI) */
     0x81, 0x00,                      /*   INPUT (Data,Ary,Abs) */
diff --git a/src/SingleReport/BootKeyboard.cpp b/src/SingleReport/BootKeyboard.cpp
index d29b2d8..c452971 100644
--- a/src/SingleReport/BootKeyboard.cpp
+++ b/src/SingleReport/BootKeyboard.cpp
@@ -47,14 +47,10 @@ static const uint8_t _hidReportDescriptorKeyboard[] PROGMEM = {
 	/* 5 LEDs for num lock etc, 3 left for advanced, custom usage */
 	0x05, 0x08,						 /*   USAGE_PAGE (LEDs) */
 	0x19, 0x01,						 /*   USAGE_MINIMUM (Num Lock) */
-	0x29, 0x05,						 /*   USAGE_MAXIMUM (Kana) TODO*/
+	0x29, 0x08,						 /*   USAGE_MAXIMUM (Kana + 3 custom)*/
 	0x95, 0x08,						 /*   REPORT_COUNT (8) */
 	0x75, 0x01,						 /*   REPORT_SIZE (1) */
 	0x91, 0x02,						 /*   OUTPUT (Data,Var,Abs) */
-	/*  Reserved 3 bits TODO */
-	//0x95, 0x01,						 /*   REPORT_COUNT (1) */
-	//0x75, 0x03,						 /*   REPORT_SIZE (3) */
-	//0x91, 0x03,						 /*   OUTPUT (Cnst,Var,Abs) */
 
     /* 6 Keyboard keys */
     0x95, 0x06,                      /*   REPORT_COUNT (6) */
diff --git a/src/SingleReport/SingleNKROKeyboard.cpp b/src/SingleReport/SingleNKROKeyboard.cpp
index bfb37a6..c5d5e24 100644
--- a/src/SingleReport/SingleNKROKeyboard.cpp
+++ b/src/SingleReport/SingleNKROKeyboard.cpp
@@ -42,17 +42,13 @@ static const uint8_t _hidReportDescriptorNKRO[] PROGMEM = {
 	/* 5 LEDs for num lock etc, 3 left for advanced, custom usage */
 	0x05, 0x08,						 /*   USAGE_PAGE (LEDs) */
 	0x19, 0x01,						 /*   USAGE_MINIMUM (Num Lock) */
-	0x29, 0x05,						 /*   USAGE_MAXIMUM (Kana) */
+	0x29, 0x08,						 /*   USAGE_MAXIMUM (Kana + 3 custom)*/
 	0x95, 0x08,						 /*   REPORT_COUNT (8) */
 	0x75, 0x01,						 /*   REPORT_SIZE (1) */
 	0x91, 0x02,						 /*   OUTPUT (Data,Var,Abs) */
-	/*  Reserved 3 bits */
-	//0x95, 0x01,						 /*   REPORT_COUNT (1) */
-	//0x75, 0x03,						 /*   REPORT_SIZE (3) */
-	//0x91, 0x03,						 /*   OUTPUT (Cnst,Var,Abs) */
 
 	/* 104 Keys as bitmap */
-	0x05, 0x07,						/*   Usage Page (Key Codes) */
+    0x05, 0x07,                     /*   USAGE_PAGE (Keyboard) */
 	0x19, 0x00,						/*   Usage Minimum (0) */
 	0x29, NKRO_KEY_COUNT - 1,		/*   Usage Maximum (103) */
 	0x15, 0x00,						/*   Logical Minimum (0) */
@@ -66,7 +62,6 @@ static const uint8_t _hidReportDescriptorNKRO[] PROGMEM = {
     0x75, 0x08,                      /*   REPORT_SIZE (8) */
     0x15, 0x00,                      /*   LOGICAL_MINIMUM (0) */
     0x26, 0xE7, 0x00,                /*   LOGICAL_MAXIMUM (231) */
-    /*0x05, 0x07,                         USAGE_PAGE (Keyboard) */
     0x19, 0x00,                      /*   USAGE_MINIMUM (Reserved (no event indicated)) */
     0x29, 0xE7,                      /*   USAGE_MAXIMUM (Keyboard Right GUI) */
     0x81, 0x00,                      /*   INPUT (Data,Ary,Abs) */