diff --git a/src/kits/bluetooth/CommandManager.cpp b/src/kits/bluetooth/CommandManager.cpp
index c22fc723aa..544eea27ed 100644
--- a/src/kits/bluetooth/CommandManager.cpp
+++ b/src/kits/bluetooth/CommandManager.cpp
@@ -548,8 +548,8 @@ const char* testingCommands[] = {
 };
 
 
-const char* hciVersion[] = { "1.0B" , "1.1 " , "1.2 " , "2.0 "};
-const char* lmpVersion[] = { "1.0 " , "1.1 " , "1.2 " , "2.0 "};
+const char* hciVersion[] = { "1.0B" , "1.1 " , "1.2 " , "2.0 " , "2.1 "};
+const char* lmpVersion[] = { "1.0 " , "1.1 " , "1.2 " , "2.0 " , "2.1 "};
 
 
 const char* 
diff --git a/src/kits/bluetooth/DiscoveryListener.cpp b/src/kits/bluetooth/DiscoveryListener.cpp
index 8b737acf65..f53ae74116 100644
--- a/src/kits/bluetooth/DiscoveryListener.cpp
+++ b/src/kits/bluetooth/DiscoveryListener.cpp
@@ -74,6 +74,7 @@ DiscoveryListener::MessageReceived(BMessage* message)
 			RemoteDevice* rd = NULL;
 			bool duplicatedFound = false;
 				
+			//  TODO: Loop for all inquiryInfo!
 			if (message->FindData("info", B_ANY_TYPE, 0, (const void**)&inquiryInfo, &size) == B_OK )
 			{
 			    // Skip duplicated replies
@@ -96,7 +97,6 @@ DiscoveryListener::MessageReceived(BMessage* message)
 
 				if (!duplicatedFound) {
 
-		            //  TODO: DeviceClass(inquiryInfo->dev_class[0] | inquiryInfo->dev_class[1]<<8 | inquiryInfo->dev_class[2]<<16 )
        	            rd = new RemoteDevice(inquiryInfo->bdaddr, (uint8*)inquiryInfo->dev_class);			        
 					fRemoteDevicesList.AddItem(rd);
 					// keep all inquiry reported data
diff --git a/src/kits/bluetooth/LocalDevice.cpp b/src/kits/bluetooth/LocalDevice.cpp
index fbd04ee1bb..3c629fbca2 100644
--- a/src/kits/bluetooth/LocalDevice.cpp
+++ b/src/kits/bluetooth/LocalDevice.cpp
@@ -241,8 +241,8 @@ LocalDevice::GetFriendlyName()
 
 	request.AddInt32("hci_id", hid);
 	request.AddData("raw command", B_ANY_TYPE, command, size);
-    request.AddInt16("eventExpected",  HCI_EVENT_CMD_COMPLETE);
-    request.AddInt16("opcodeExpected", PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
+	request.AddInt16("eventExpected",  HCI_EVENT_CMD_COMPLETE);
+	request.AddInt16("opcodeExpected", PACK_OPCODE(OGF_CONTROL_BASEBAND, OCF_READ_LOCAL_NAME));
 
 	if (fMessenger->SendMessage(&request, &reply) == B_OK &&
 		reply.FindString("friendlyname", &friendlyname) == B_OK){		
@@ -381,7 +381,9 @@ LocalDevice::LocalDevice(hci_id hid) : hid(hid)
 	// HARDCODE -> move this to addons
 	if (GetProperty("manufacturer", &value) == B_OK
 		&& value == 15) {
-//		Reset();	// Perform a reset to Broadcom buggyland
+
+		// Uncomment this out if your Broadcom dongle is not working properly
+		// Reset();	// Perform a reset to Broadcom buggyland
 		
 
 //#define BT_WRITE_BDADDR_FOR_BCM2035