diff --git a/TODO b/TODO
index 0873356..2118578 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
 Extensions on existing code:
+* bfile:     implement the optimization-restart as realized by Kbd2
 * kernel:    use GINT_CB() for all callbacks, without breaking the timer API
 * kernel:    better restore to userspace before panic (ensure BL=0 IMASK=0)
 * kernel:    check if cpu_setVBR() really needs to be perma-mapped
diff --git a/include/gint/std/string.h b/include/gint/std/string.h
index 892c700..666ef37 100644
--- a/include/gint/std/string.h
+++ b/include/gint/std/string.h
@@ -13,7 +13,7 @@ void *memcpy(void * restrict dest, void const * restrict src, size_t n);
 /* memset(): Fill a chunk of memory with a single byte */
 void *memset(void *dest, int byte, size_t n);
 
-/* memcpy(): Compare two chunks of memory */
+/* memcmp(): Compare two chunks of memory */
 int memcmp(void const *s1, void const *s2, size_t n);
 
 /* memmove(): Copy a chunk of memory to a possibly overlapping destination */
diff --git a/src/kmalloc/arena_gint.c b/src/kmalloc/arena_gint.c
index e8aa228..7cbdbc2 100644
--- a/src/kmalloc/arena_gint.c
+++ b/src/kmalloc/arena_gint.c
@@ -33,7 +33,7 @@
    detect whether to merge into the previous block after a free().
 
    The allocation algorithm will mostly use way #3 to find free blocks. When
-   freeing, ways #1 and #2 are used to coalese adjacent blocks. Ways #3 and #4
+   freeing, ways #1 and #2 are used to coalesce adjacent blocks. Ways #3 and #4
    are used to maintain the linked lists.
 
    The footer uses 8 bytes if the block has 8 bytes of raw data, and 12 bytes