diff --git a/tool/Makefile b/tool/Makefile
index cd96c2a..4800c9c 100644
--- a/tool/Makefile
+++ b/tool/Makefile
@@ -20,11 +20,12 @@ GTK_LDFLAGS=`pkg-config --libs gtk+-3.0 gmodule-2.0`
 
 PREFIX=/usr/local
 
+PROGS=gcn64ctl mempak_ls mempak_format mempak_extract_note mempak_insert_note mempak_rm mempak_convert gcn64ctl_gui
 MEMPAKLIB_OBJS=mempak.o mempak_fs.o
 
 .PHONY : clean install
 
-all: gcn64ctl mempak_ls mempak_format mempak_extract_note mempak_insert_note mempak_rm mempak_convert gcn64ctl_gui
+all: $(PROGS)
 
 gcn64ctl_gui: gcn64ctl_gui.o gcn64ctl_gui_mpkedit.o gcn64.o gcn64lib.o hexdump.o ihex.o mempak_gcn64usb.o $(COMPAT_OBJS) $(MEMPAKLIB_OBJS)
 	$(LD) $^ $(LDFLAGS) $(GTK_LDFLAGS) -o $@
@@ -61,7 +62,7 @@ mempak_format: mempak_format.o $(MEMPAKLIB_OBJS)
 	$(CC) $(CFLAGS) -c $<
 
 clean:
-	rm -f *.o gcn64ctl gcn64ctl_gui gcn64ctl.exe gcn64ctl_gui.exe
+	rm -f *.o *.exe $(PROGS)
 
 install:
 	@echo "Install not done yet. Sorry"
diff --git a/tool/gcn64ctl_gui_mpkedit.c b/tool/gcn64ctl_gui_mpkedit.c
index 6356f24..6bb2d35 100644
--- a/tool/gcn64ctl_gui_mpkedit.c
+++ b/tool/gcn64ctl_gui_mpkedit.c
@@ -138,7 +138,7 @@ void mpke_syncModel(struct application *app)
 			gtk_list_store_set(n64_notes, &iter, 0, i, 1, "!!ERROR!!", 2, 0, -1);
 		} else {
 			if (note_data.valid) {
-				gtk_list_store_set(n64_notes, &iter, 0, i, 1, note_data.name, 2, note_data.blocks, -1);
+				gtk_list_store_set(n64_notes, &iter, 0, i, 1, note_data.name, 2, note_data.blocks, 3, app->mpke->mpk->note_comments[i], -1);
 			} else {
 				gtk_list_store_set(n64_notes, &iter, 0, i, -1);
 			}