diff --git a/src/gui/editControls.cpp b/src/gui/editControls.cpp
index 91db32f52..f7e40c39e 100644
--- a/src/gui/editControls.cpp
+++ b/src/gui/editControls.cpp
@@ -138,6 +138,10 @@ void FurnaceGUI::drawMobileControls() {
       ImGui::EndTable();
     }
 
+    if (ImGui::Button("Create Ins")) {
+      doAction(GUI_ACTION_INS_LIST_ADD);
+    }
+
     ImGui::Text("Data list goes here...");
 
     if (ImGui::Button("New")) {
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4aff36574..9a49dd48b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -4669,7 +4669,6 @@ bool FurnaceGUI::init() {
         SDL_SetWindowSize(sdlWin,scrW*dpiScale,scrH*dpiScale);
       }
     }
-#endif
 
     if (SDL_GetDisplayUsableBounds(SDL_GetWindowDisplayIndex(sdlWin),&displaySize)==0) {
       if (scrW>((displaySize.w/dpiScale)-48) && scrH>((displaySize.h/dpiScale)-64)) {
@@ -4684,6 +4683,7 @@ bool FurnaceGUI::init() {
         SDL_SetWindowSize(sdlWin,scrW*dpiScale,scrH*dpiScale);
       }
     }
+#endif
   }
 #endif
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 7a67ac374..c4a3e18c3 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -887,9 +887,10 @@ struct FurnaceGUIMacroDesc {
   ImVec4 color;
   unsigned int bitOffset;
   bool isBitfield, blockMode, bit30;
-  String (*hoverFunc)(int,float);
+  String (*hoverFunc)(int,float,void*);
+  void* hoverFuncUser;
 
-  FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0, bool bit30Special=false):
+  FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float,void*)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0, bool bit30Special=false, void* hfu=NULL):
     macro(m),
     height(macroHeight),
     displayName(name),
@@ -900,7 +901,8 @@ struct FurnaceGUIMacroDesc {
     isBitfield(bitfield),
     blockMode(block),
     bit30(bit30Special),
-    hoverFunc(hf) {
+    hoverFunc(hf),
+    hoverFuncUser(hfu) {
     // MSVC -> hell
     this->min=macroMin;
     this->max=macroMax;
diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 84b70d771..b8427ee45 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -316,27 +316,31 @@ const char* macroRelativeMode="Relative";
 const char* macroQSoundMode="QSound";
 const char* macroDummyMode="Bug";
 
-String macroHoverNote(int id, float val) {
-  if (val<-60 || val>=120) return "???";
-  return fmt::sprintf("%d: %s",id,noteNames[(int)val+60]);
+String macroHoverNote(int id, float val, void* u) {
+  int* macroVal=(int*)u;
+  if ((macroVal[id]&0xc0000000)==0x40000000 || (macroVal[id]&0xc0000000)==0x80000000) {
+    if (val<-60 || val>=120) return "???";
+    return fmt::sprintf("%d: %s",id,noteNames[(int)val+60]);
+  }
+  return fmt::sprintf("%d: %d",id,(int)val);
 }
 
-String macroHover(int id, float val) {
+String macroHover(int id, float val, void* u) {
   return fmt::sprintf("%d: %d",id,val);
 }
 
-String macroHoverLoop(int id, float val) {
+String macroHoverLoop(int id, float val, void* u) {
   if (val>1) return "Release";
   if (val>0) return "Loop";
   return "";
 }
 
-String macroHoverBit30(int id, float val) {
+String macroHoverBit30(int id, float val, void* u) {
   if (val>0) return "Fixed";
   return "Relative";
 }
 
-String macroHoverES5506FilterMode(int id, float val) {
+String macroHoverES5506FilterMode(int id, float val, void* u) {
   String mode="???";
   switch (((int)val)&3) {
     case 0:
@@ -357,7 +361,7 @@ String macroHoverES5506FilterMode(int id, float val) {
   return fmt::sprintf("%d: %s",id,mode);
 }
 
-String macroLFOWaves(int id, float val) {
+String macroLFOWaves(int id, float val, void* u) {
   switch (((int)val)&3) {
     case 0:
       return "Saw";
@@ -1355,7 +1359,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros) {
       if (i.isBitfield) {
         PlotBitfield("##IMacro",asInt,totalFit,0,i.bitfieldBits,i.max,ImVec2(availableWidth,(i.macro->open)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),doHighlight);
       } else {
-        PlotCustom("##IMacro",asFloat,totalFit,macroDragScroll,NULL,i.min+i.macro->vScroll,i.min+i.macro->vScroll+i.macro->vZoom,ImVec2(availableWidth,(i.macro->open)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),i.color,i.macro->len-macroDragScroll,i.hoverFunc,i.blockMode,i.macro->open?genericGuide:NULL,doHighlight);
+        PlotCustom("##IMacro",asFloat,totalFit,macroDragScroll,NULL,i.min+i.macro->vScroll,i.min+i.macro->vScroll+i.macro->vZoom,ImVec2(availableWidth,(i.macro->open)?(i.height*dpiScale):(32.0f*dpiScale)),sizeof(float),i.color,i.macro->len-macroDragScroll,i.hoverFunc,i.hoverFuncUser,i.blockMode,i.macro->open?genericGuide:NULL,doHighlight);
       }
       if (i.macro->open && (ImGui::IsItemClicked(ImGuiMouseButton_Left) || ImGui::IsItemClicked(ImGuiMouseButton_Right))) {
         macroDragStart=ImGui::GetItemRectMin();
@@ -3613,7 +3617,7 @@ void FurnaceGUI::drawInsEdit() {
             modTable[i]=ins->fds.modTable[i];
           }
           ImVec2 modTableSize=ImVec2(ImGui::GetContentRegionAvail().x,96.0f*dpiScale);
-          PlotCustom("ModTable",modTable,32,0,NULL,-4,3,modTableSize,sizeof(float),ImVec4(1.0f,1.0f,1.0f,1.0f),0,NULL,true);
+          PlotCustom("ModTable",modTable,32,0,NULL,-4,3,modTableSize,sizeof(float),ImVec4(1.0f,1.0f,1.0f,1.0f),0,NULL,NULL,true);
           if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
             macroDragStart=ImGui::GetItemRectMin();
             macroDragAreaSize=modTableSize;
@@ -4232,7 +4236,7 @@ void FurnaceGUI::drawInsEdit() {
           if (volMax>0) {
             macroList.push_back(FurnaceGUIMacroDesc(volumeLabel,&ins->std.volMacro,volMin,volMax,160,uiColors[GUI_COLOR_MACRO_VOLUME]));
           }
-          macroList.push_back(FurnaceGUIMacroDesc("Arpeggio",&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,NULL,false,NULL,0,true));
+          macroList.push_back(FurnaceGUIMacroDesc("Arpeggio",&ins->std.arpMacro,-120,120,160,uiColors[GUI_COLOR_MACRO_PITCH],true,NULL,macroHoverNote,false,NULL,0,true,ins->std.arpMacro.val));
           if (dutyMax>0) {
             if (ins->type==DIV_INS_MIKEY) {
               macroList.push_back(FurnaceGUIMacroDesc(dutyLabel,&ins->std.dutyMacro,0,dutyMax,160,uiColors[GUI_COLOR_MACRO_OTHER],false,NULL,NULL,true,mikeyFeedbackBits));
diff --git a/src/gui/plot_nolerp.cpp b/src/gui/plot_nolerp.cpp
index d802cbc52..b75bda4f0 100644
--- a/src/gui/plot_nolerp.cpp
+++ b/src/gui/plot_nolerp.cpp
@@ -293,7 +293,7 @@ void PlotBitfield(const char* label, const int* values, int values_count, int va
     PlotBitfieldEx(label, &Plot_IntArrayGetter, (void*)&data, values_count, values_offset, overlay_text, bits, graph_size, values_highlight, highlightColor);
 }
 
-int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
+int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_getter)(void* data, int idx), void* data, int values_count, int values_display_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 frame_size, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser, bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
 {
     ImGuiContext& g = *GImGui;
     ImGuiWindow* window = ImGui::GetCurrentWindow();
@@ -359,7 +359,7 @@ int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_gett
             const float v0 = values_getter(data, (v_idx) % values_count);
             const float v1 = values_getter(data, (v_idx + 1) % values_count);
             if (hoverFunc) {
-              std::string hoverText=hoverFunc(v_idx+values_display_offset,v0);
+              std::string hoverText=hoverFunc(v_idx+values_display_offset,v0,hoverFuncUser);
               if (!hoverText.empty()) {
                 ImGui::SetTooltip("%s",hoverText.c_str());
               }
@@ -459,8 +459,8 @@ int PlotCustomEx(ImGuiPlotType plot_type, const char* label, float (*values_gett
     return idx_hovered;
 }
 
-void PlotCustom(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float), bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset, const char* overlay_text, float scale_min, float scale_max, ImVec2 graph_size, int stride, ImVec4 color, int highlight, std::string (*hoverFunc)(int,float,void*), void* hoverFuncUser, bool blockMode, std::string (*guideFunc)(float), const bool* values_highlight, ImVec4 highlightColor)
 {
     FurnacePlotArrayGetterData data(values, stride);
-    PlotCustomEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, color, highlight, hoverFunc, blockMode, guideFunc, values_highlight, highlightColor);
-}
\ No newline at end of file
+    PlotCustomEx(ImGuiPlotType_Histogram, label, &Plot_ArrayGetter, (void*)&data, values_count, values_offset, overlay_text, scale_min, scale_max, graph_size, color, highlight, hoverFunc, hoverFuncUser, blockMode, guideFunc, values_highlight, highlightColor);
+}
diff --git a/src/gui/plot_nolerp.h b/src/gui/plot_nolerp.h
index b353e6f8b..48332b339 100644
--- a/src/gui/plot_nolerp.h
+++ b/src/gui/plot_nolerp.h
@@ -22,4 +22,4 @@
 
 void PlotNoLerp(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float));
 void PlotBitfield(const char* label, const int* values, int values_count, int values_offset = 0, const char** overlay_text = NULL, int bits = 8, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));
-void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float) = NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL, const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));
\ No newline at end of file
+void PlotCustom(const char* label, const float* values, int values_count, int values_offset = 0, const char* overlay_text = NULL, float scale_min = FLT_MAX, float scale_max = FLT_MAX, ImVec2 graph_size = ImVec2(0, 0), int stride = sizeof(float), ImVec4 fgColor = ImVec4(1.0f,1.0f,1.0f,1.0f), int highlight = 0, std::string (*hoverFunc)(int,float,void*) = NULL, void* hoverFuncUser=NULL, bool blockMode=false, std::string (*guideFunc)(float) = NULL, const bool* values_highlight = NULL, ImVec4 highlightColor = ImVec4(1.0f,1.0f,1.0f,1.0f));
diff --git a/src/gui/waveEdit.cpp b/src/gui/waveEdit.cpp
index 1132b9ea0..f26f45833 100644
--- a/src/gui/waveEdit.cpp
+++ b/src/gui/waveEdit.cpp
@@ -271,7 +271,7 @@ void FurnaceGUI::drawWaveEdit() {
         if (waveEditStyle) {
           PlotNoLerp("##Waveform",wavePreview,wave->len+1,0,NULL,0,wave->max,contentRegion);
         } else {
-          PlotCustom("##Waveform",wavePreview,wave->len,0,NULL,0,wave->max,contentRegion,sizeof(float),ImVec4(1.0f,1.0f,1.0f,1.0f),0,NULL,true);
+          PlotCustom("##Waveform",wavePreview,wave->len,0,NULL,0,wave->max,contentRegion,sizeof(float),ImVec4(1.0f,1.0f,1.0f,1.0f),0,NULL,NULL,true);
         }
         if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
           waveDragStart=ImGui::GetItemRectMin();
@@ -412,7 +412,7 @@ void FurnaceGUI::drawWaveEdit() {
                   ImGui::TableNextColumn();
                   ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
                   ImGui::PushID(i);
-                  if (CWSliderInt("##WGMULT",&waveGenMult[i],0,15)) {
+                  if (CWSliderInt("##WGMULT",&waveGenMult[i],1,16)) {
                     doGenerateWave();
                   }
                   ImGui::PopID();