diff --git a/src/gui/piano.cpp b/src/gui/piano.cpp
index b53f97c2..3c501c45 100644
--- a/src/gui/piano.cpp
+++ b/src/gui/piano.cpp
@@ -381,7 +381,6 @@ void FurnaceGUI::drawPiano() {
           pianoOptions=!pianoOptions;
         }
 
-        // TODO: wave and sample preview
         // first check released keys
         for (int i=0; i<180; i++) {
           int note=i-60;
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 47200f7b..412dd2a9 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -3814,14 +3814,10 @@ void FurnaceGUI::popWarningColor() {
 #ifdef _WIN32
 #define SYSTEM_FONT_PATH_1 "C:\\Windows\\Fonts\\segoeui.ttf"
 #define SYSTEM_FONT_PATH_2 "C:\\Windows\\Fonts\\tahoma.ttf"
-// TODO!
-#define SYSTEM_FONT_PATH_3 "C:\\Windows\\Fonts\\tahoma.ttf"
-// TODO!
+#define SYSTEM_FONT_PATH_3 "C:\\Windows\\Fonts\\micross.ttf"
 #define SYSTEM_HEAD_FONT_PATH_1 "C:\\Windows\\Fonts\\segoeui.ttf"
 #define SYSTEM_HEAD_FONT_PATH_2 "C:\\Windows\\Fonts\\tahoma.ttf"
-// TODO!
-#define SYSTEM_HEAD_FONT_PATH_3 "C:\\Windows\\Fonts\\tahoma.ttf"
-// TODO!
+#define SYSTEM_HEAD_FONT_PATH_3 "C:\\Windows\\Fonts\\micross.ttf"
 #define SYSTEM_PAT_FONT_PATH_1 "C:\\Windows\\Fonts\\consola.ttf"
 #define SYSTEM_PAT_FONT_PATH_2 "C:\\Windows\\Fonts\\cour.ttf"
 // GOOD LUCK WITH THIS ONE - UNTESTED
@@ -4235,7 +4231,6 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
     mainFont->EllipsisCharCount=3;
   }
 
-  // TODO: allow changing these colors.
   ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByTypeDir,"",uiColors[GUI_COLOR_FILE_DIR],ICON_FA_FOLDER_O);
   ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByTypeFile,"",uiColors[GUI_COLOR_FILE_OTHER],ICON_FA_FILE_O);
   ImGuiFileDialog::Instance()->SetFileStyle(IGFD_FileStyleByExtension,".fur",uiColors[GUI_COLOR_FILE_SONG_NATIVE],ICON_FA_FILE);
diff --git a/src/gui/sysConf.cpp b/src/gui/sysConf.cpp
index 2f80a8b9..9e54ae7f 100644
--- a/src/gui/sysConf.cpp
+++ b/src/gui/sysConf.cpp
@@ -1602,7 +1602,7 @@ bool FurnaceGUI::drawSysConf(int chan, DivSystem type, DivConfig& flags, bool mo
       }
       break;
     }
-    case DIV_SYSTEM_SNES: { // TODO: echo
+    case DIV_SYSTEM_SNES: {
       char temp[64];
       int vsL=127-(flags.getInt("volScaleL",0)&127);
       int vsR=127-(flags.getInt("volScaleR",0)&127);
diff --git a/src/gui/sysEx.cpp b/src/gui/sysEx.cpp
index 5a72649e..aa86363f 100644
--- a/src/gui/sysEx.cpp
+++ b/src/gui/sysEx.cpp
@@ -60,8 +60,7 @@ bool FurnaceGUI::parseSysEx(unsigned char* data, size_t len) {
           op.rs=reader.readC();
           reader.readC(); // EBS - ignore
           op.am=reader.readC();
-          // TODO: don't ignore after I add KVS to Furnace
-          reader.readC(); // KVS - ignore
+          op.kvs=(reader.readC()>2)?1:0;
           op.tl=3+((99-reader.readC())*124)/99;
           unsigned char freq=reader.readC();
           logV("OP%d freq: %d",i,freq);