diff --git a/TODO.md b/TODO.md
index 18c43c49d..54e966303 100644
--- a/TODO.md
+++ b/TODO.md
@@ -30,7 +30,6 @@
 - store edit/followOrders/followPattern state in config
 - add ability to select a column by double clicking
 - add ability to move selection by dragging
-- NSFPlay core for NES
 - settings: OK/Cancel buttons should be always visible
 - Apply button in settings
 - better FM chip names (number and codename)
diff --git a/src/engine/dispatch.h b/src/engine/dispatch.h
index c91b56efd..2646a7947 100644
--- a/src/engine/dispatch.h
+++ b/src/engine/dispatch.h
@@ -64,9 +64,24 @@ enum DivDispatchCmds {
   DIV_CMD_FM_LFO, // (speed)
   DIV_CMD_FM_LFO_WAVE, // (waveform)
   DIV_CMD_FM_TL, // (op, value)
+  DIV_CMD_FM_AM, // (op, value)
   DIV_CMD_FM_AR, // (op, value)
+  DIV_CMD_FM_DR, // (op, value)
+  DIV_CMD_FM_SL, // (op, value)
+  DIV_CMD_FM_D2R, // (op, value)
+  DIV_CMD_FM_RR, // (op, value)
+  DIV_CMD_FM_DT, // (op, value)
+  DIV_CMD_FM_DT2, // (op, value)
+  DIV_CMD_FM_RS, // (op, value)
+  DIV_CMD_FM_KSR, // (op, value)
+  DIV_CMD_FM_VIB, // (op, value)
+  DIV_CMD_FM_SUS, // (op, value)
+  DIV_CMD_FM_WS, // (op, value)
+  DIV_CMD_FM_SSG, // (op, value)
   DIV_CMD_FM_FB, // (value)
   DIV_CMD_FM_MULT, // (op, value)
+  DIV_CMD_FM_FINE, // (op, value)
+  DIV_CMD_FM_FIXFREQ, // (op, value)
   DIV_CMD_FM_EXTCH, // (enabled)
   DIV_CMD_FM_AM_DEPTH, // (depth)
   DIV_CMD_FM_PM_DEPTH, // (depth)
diff --git a/src/engine/playback.cpp b/src/engine/playback.cpp
index f478f9a1a..c959f64ac 100644
--- a/src/engine/playback.cpp
+++ b/src/engine/playback.cpp
@@ -65,9 +65,24 @@ const char* cmdName[]={
   "FM_LFO",
   "FM_LFO_WAVE",
   "FM_TL",
+  "FM_AM",
   "FM_AR",
+  "FM_DR",
+  "FM_SL",
+  "FM_D2R",
+  "FM_RR",
+  "FM_DT",
+  "FM_DT2",
+  "FM_RS",
+  "FM_KSR",
+  "FM_VIB",
+  "FM_SUS",
+  "FM_WS",
+  "FM_SSG",
   "FM_FB",
   "FM_MULT",
+  "FM_FINE",
+  "FM_FIXFREQ",
   "FM_EXTCH",
   "FM_AM_DEPTH",
   "FM_PM_DEPTH",