diff --git a/src/engine/platform/n163.cpp b/src/engine/platform/n163.cpp
index 6a0bfb04..96ccf2d4 100644
--- a/src/engine/platform/n163.cpp
+++ b/src/engine/platform/n163.cpp
@@ -199,9 +199,6 @@ void DivPlatformN163::tick(bool sysTick) {
     if (chan[i].std.duty.had) {
       if (chan[i].curWavePos!=chan[i].std.duty.val) {
         chan[i].curWavePos=chan[i].std.duty.val;
-        if (chan[i].waveMode&0x2) {
-          chan[i].waveUpdated=true;
-        }
         chan[i].waveChanged=true;
       }
     }
@@ -209,7 +206,7 @@ void DivPlatformN163::tick(bool sysTick) {
       if (chan[i].wave!=chan[i].std.wave.val || chan[i].ws.activeChanged()) {
         chan[i].wave=chan[i].std.wave.val;
         chan[i].ws.changeWave1(chan[i].wave);
-        if (chan[i].waveMode&0x2) {
+        if (chan[i].waveMode) {
           chan[i].waveUpdated=true;
         }
       }
@@ -226,29 +223,9 @@ void DivPlatformN163::tick(bool sysTick) {
     if (chan[i].std.ex1.had) {
       if (chan[i].curWaveLen!=(chan[i].std.ex1.val&0xfc)) {
         chan[i].curWaveLen=chan[i].std.ex1.val&0xfc;
-        chan[i].ws.setWidth(chan[i].waveLen);
-        if (chan[i].waveMode&0x2) {
-          chan[i].waveUpdated=true;
-        }
         chan[i].freqChanged=true;
       }
     }
-    if (chan[i].std.ex2.had) {
-      if ((chan[i].waveMode&0x2)!=(chan[i].std.ex2.val&0x2)) { // update when every waveform changed
-        chan[i].waveMode=(chan[i].waveMode&~0x2)|(chan[i].std.ex2.val&0x2);
-        if (chan[i].waveMode&0x2) {
-          chan[i].waveUpdated=true;
-          chan[i].waveChanged=true;
-        }
-      }
-      if ((chan[i].waveMode&0x1)!=(chan[i].std.ex2.val&0x1)) { // update waveform now
-        chan[i].waveMode=(chan[i].waveMode&~0x1)|(chan[i].std.ex2.val&0x1);
-        if (chan[i].waveMode&0x1) { // rising edge
-          chan[i].waveUpdated=true;
-          chan[i].waveChanged=true;
-        }
-      }
-    }
     if (chan[i].volumeChanged) {
       if (chan[i].active && !isMuted[i]) {
         chWriteMask(i,0x7,chan[i].resVol&0xf,0xf);
@@ -283,12 +260,6 @@ void DivPlatformN163::tick(bool sysTick) {
       if (chan[i].freq<0) chan[i].freq=0;
       if (chan[i].freq>0x3ffff) chan[i].freq=0x3ffff;
       if (chan[i].keyOn) {
-        if (chan[i].wave<0) {
-          chan[i].wave=0;
-          if (chan[i].waveMode&0x2) {
-            updateWaveCh(i);
-          }
-        }
       }
       if (chan[i].keyOff && !isMuted[i]) {
         chWriteMask(i,0x7,0,0xf);
@@ -308,16 +279,21 @@ int DivPlatformN163::dispatch(DivCommand c) {
     case DIV_CMD_NOTE_ON: {
       DivInstrument* ins=parent->getIns(chan[c.chan].ins,DIV_INS_N163);
       if (chan[c.chan].insChanged) {
-        chan[c.chan].wave=ins->n163.wave;
+        if (ins->n163.wave>=0) {
+          chan[c.chan].wave=ins->n163.wave;
+        }
         chan[c.chan].wavePos=ins->n163.wavePos;
         chan[c.chan].waveLen=ins->n163.waveLen;
         chan[c.chan].waveMode=ins->n163.waveMode;
         chan[c.chan].curWavePos=chan[c.chan].wavePos;
         chan[c.chan].curWaveLen=chan[c.chan].waveLen;
         chan[c.chan].ws.init(NULL,chan[c.chan].waveLen,15,true);
+        if (chan[c.chan].wave<0) {
+          chan[c.chan].wave=0;
+        }
         chan[c.chan].ws.changeWave1(chan[c.chan].wave);
         chan[c.chan].waveChanged=true;
-        if (chan[c.chan].waveMode&0x3 || ins->ws.enabled) {
+        if (chan[c.chan].waveMode) {
           chan[c.chan].waveUpdated=true;
         }
       }
@@ -341,7 +317,7 @@ int DivPlatformN163::dispatch(DivCommand c) {
       chan[c.chan].active=false;
       chan[c.chan].keyOff=true;
       chan[c.chan].keyOn=false;
-      //chan[c.chan].macroInit(NULL);
+      chan[c.chan].macroInit(NULL);
       break;
     case DIV_CMD_NOTE_OFF_ENV:
       chan[c.chan].active=false;
@@ -404,32 +380,19 @@ int DivPlatformN163::dispatch(DivCommand c) {
     }
     case DIV_CMD_WAVE:
       chan[c.chan].wave=c.value;
-      if (chan[c.chan].waveMode&0x2) {
+      if (chan[c.chan].waveMode) {
         chan[c.chan].waveUpdated=true;
       }
       chan[c.chan].keyOn=true;
       break;
     case DIV_CMD_N163_WAVE_POSITION:
       chan[c.chan].curWavePos=c.value;
-      if (chan[c.chan].waveMode&0x2) {
-        chan[c.chan].waveUpdated=true;
-      }
       chan[c.chan].waveChanged=true;
       break;
     case DIV_CMD_N163_WAVE_LENGTH:
       chan[c.chan].curWaveLen=c.value&0xfc;
-      if (chan[c.chan].waveMode&0x2) {
-        chan[c.chan].waveUpdated=true;
-      }
       chan[c.chan].freqChanged=true;
       break;
-    case DIV_CMD_N163_WAVE_MODE:
-      chan[c.chan].waveMode=c.value&0x3;
-      if (chan[c.chan].waveMode&0x3) { // update now
-        chan[c.chan].waveUpdated=true;
-        chan[c.chan].waveChanged=true;
-      }
-      break;
     case DIV_CMD_N163_GLOBAL_WAVE_LOAD:
       loadWave=c.value;
       // TODO: load wave here
@@ -490,9 +453,6 @@ void DivPlatformN163::forceIns() {
       chan[i].freqChanged=true;
       chan[i].volumeChanged=true;
       chan[i].waveChanged=true;
-      if (chan[i].waveMode&0x2) {
-        chan[i].waveUpdated=true;
-      }
     }
   }
 }
@@ -500,7 +460,7 @@ void DivPlatformN163::forceIns() {
 void DivPlatformN163::notifyWaveChange(int wave) {
   for (int i=0; i<8; i++) {
     if (chan[i].wave==wave) {
-      if (chan[i].waveMode&0x2) {
+      if (chan[i].waveMode) {
         chan[i].ws.changeWave1(wave);
         chan[i].waveUpdated=true;
       }
diff --git a/src/engine/platform/n163.h b/src/engine/platform/n163.h
index f3069924..3ebcbc44 100644
--- a/src/engine/platform/n163.h
+++ b/src/engine/platform/n163.h
@@ -30,7 +30,7 @@ class DivPlatformN163: public DivDispatch {
     signed char resVol;
     short wave, wavePos, waveLen;
     short curWavePos, curWaveLen;
-    unsigned char waveMode;
+    bool waveMode;
     bool volumeChanged;
     bool waveChanged, waveUpdated;
     DivWaveSynth ws;
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 01438ace..969714d7 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -4666,9 +4666,20 @@ void FurnaceGUI::drawInsEdit() {
           }
         }
         if (ins->type==DIV_INS_N163) if (ImGui::BeginTabItem("Namco 163")) {
-          if (ImGui::InputInt("Waveform##WAVE",&ins->n163.wave,1,10)) { PARAMETER
-            if (ins->n163.wave<0) ins->n163.wave=0;
-            if (ins->n163.wave>=e->song.waveLen) ins->n163.wave=e->song.waveLen-1;
+          bool preLoad=ins->n163.waveMode&0x1;
+          if (ImGui::Checkbox("Load waveform",&preLoad)) { PARAMETER
+            ins->n163.waveMode=(ins->n163.waveMode&~0x1)|(preLoad?0x1:0);
+          }
+
+          if (ImGui::IsItemHovered()) {
+            ImGui::SetTooltip("when enabled, a waveform will be loaded into RAM.\nwhen disabled, only the offset and length change.");
+          }
+
+          if (preLoad) {
+            if (ImGui::InputInt("Waveform##WAVE",&ins->n163.wave,1,10)) { PARAMETER
+              if (ins->n163.wave<0) ins->n163.wave=0;
+              if (ins->n163.wave>=e->song.waveLen) ins->n163.wave=e->song.waveLen-1;
+            }
           }
           if (ImGui::InputInt("Offset##WAVEPOS",&ins->n163.wavePos,1,16)) { PARAMETER
             if (ins->n163.wavePos<0) ins->n163.wavePos=0;
@@ -4679,16 +4690,6 @@ void FurnaceGUI::drawInsEdit() {
             if (ins->n163.waveLen>252) ins->n163.waveLen=252;
             ins->n163.waveLen&=0xfc;
           }
-
-          bool preLoad=ins->n163.waveMode&0x1;
-          if (ImGui::Checkbox("Load waveform before playback",&preLoad)) { PARAMETER
-            ins->n163.waveMode=(ins->n163.waveMode&~0x1)|(preLoad?0x1:0);
-          }
-          bool waveMode=ins->n163.waveMode&0x2;
-          if (ImGui::Checkbox("Update waveforms into RAM when every waveform changes",&waveMode)) { PARAMETER
-            ins->n163.waveMode=(ins->n163.waveMode&~0x2)|(waveMode?0x2:0);
-          }
-
           ImGui::EndTabItem();
         }
         if (ins->type==DIV_INS_FDS) if (ImGui::BeginTabItem("FDS")) {