diff --git a/BOOT/ENVIRON/LIB/EFI/efiinit.c b/BOOT/ENVIRON/LIB/EFI/efiinit.c
index b20900f..4020040 100644
--- a/BOOT/ENVIRON/LIB/EFI/efiinit.c
+++ b/BOOT/ENVIRON/LIB/EFI/efiinit.c
@@ -206,6 +206,9 @@ Return Value:
     }
     BootDevice->Size = sizeof(BOOT_DEVICE);
 
+    //
+    // Memory map devices are treated as ramdisks.
+    //
     if (DevicePathType(EfiDevicePath) == HARDWARE_DEVICE_PATH && DevicePathSubType(EfiDevicePath) == HW_MEMMAP_DP) {
         MemmapNode = (MEMMAP_DEVICE_PATH *)EfiDevicePath;
         BlockDevice = &BootDevice->Block;
@@ -218,7 +221,7 @@ Return Value:
     }
 
     //
-    // TODO: Only media devices and ramdisks are currently supported.
+    // TODO: Support more devices than just HDD/CD-ROM and ramdisks.
     //
     DeviceNode = EfiInitpGetDeviceNode(EfiDevicePath);
     if (DevicePathType(DeviceNode) != MEDIA_DEVICE_PATH) {
@@ -547,7 +550,7 @@ Return Value:
 
     //
     // Convert the EFI file path into a boot file path option.
-    // TODO: UDP/PXE are not supported.
+    // TODO: Support UDP/PXE boot.
     //
     PrevOption = Option;
     Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)&Entry->Options + OptionsSize);
@@ -561,7 +564,7 @@ Return Value:
     BufferRemaining -= Size;
 
     //
-    // TODO: Additional options in LoadOptions are not parsed.
+    // TODO: Parse additional options from LoadOptions.
     //
     PrevOption = Option;
     Option = (PBOOT_APPLICATION_OPTION)((PUCHAR)&Entry->Options + OptionsSize);
diff --git a/BOOT/ENVIRON/LIB/EFI/efimm.c b/BOOT/ENVIRON/LIB/EFI/efimm.c
index 10c83c3..b4e033d 100644
--- a/BOOT/ENVIRON/LIB/EFI/efimm.c
+++ b/BOOT/ENVIRON/LIB/EFI/efimm.c
@@ -572,7 +572,7 @@ Return Value:
     }
 
     //
-    // TODO: Account for possible MDL changes due to EfiFreePages(EfiBuffer).
+    // TODO: Account for possible MDL changes due to freeing EfiBuffer.
     //
 
 exit:
diff --git a/BOOT/ENVIRON/LIB/MM/mm.c b/BOOT/ENVIRON/LIB/MM/mm.c
index 2926e3c..c0a4c91 100644
--- a/BOOT/ENVIRON/LIB/MM/mm.c
+++ b/BOOT/ENVIRON/LIB/MM/mm.c
@@ -41,7 +41,7 @@ Return Value:
 
 {
     //
-    // TODO: Implement this.
+    // TODO: Implement this routine.
     //
 
     return STATUS_SUCCESS;
diff --git a/BOOT/ENVIRON/LIB/MM/mmmd.c b/BOOT/ENVIRON/LIB/MM/mmmd.c
index f226be6..ec8f037 100644
--- a/BOOT/ENVIRON/LIB/MM/mmmd.c
+++ b/BOOT/ENVIRON/LIB/MM/mmmd.c
@@ -83,7 +83,7 @@ Return Value:
     }
 
     //
-    // TODO: Incomplete.
+    // TODO: Implement the rest of this routine.
     //
     ConsolePrint(L"MmMdpHasPrecedence() is incomplete\r\n");
     return TRUE;
@@ -441,7 +441,7 @@ Return Value:
     }
 
     //
-    // TODO: Finish this function.
+    // TODO: Implement the rest of this routine.
     //
 
     return STATUS_SUCCESS;
@@ -490,7 +490,7 @@ Return Value:
 
     //
     // Free the descriptor from the heap.
-    // TODO: Use BlMmFreeHeap()
+    // TODO: Use BlMmFreeHeap().
     //
     ConsolePrint(L"MmMdFreeDescriptor(): need BlMmFreeHeap() to free descriptor\r\n");
     return STATUS_NOT_IMPLEMENTED;
@@ -565,6 +565,7 @@ Return Value:
     PMEMORY_DESCRIPTOR Descriptor;
 
     if (MmGlobalMemoryDescriptorsUsed >= MmGlobalMemoryDescriptorCount) {
+        DebugPrint(L"MmMdInitDescriptor(): No free descriptors available\r\n");
         return NULL;
     }