diff --git a/src/engine/wavetable.cpp b/src/engine/wavetable.cpp
new file mode 100644
index 000000000..01a8b1614
--- /dev/null
+++ b/src/engine/wavetable.cpp
@@ -0,0 +1,3 @@
+#include "wavetable.h"
+
+// ???
diff --git a/src/engine/wavetable.h b/src/engine/wavetable.h
index 7764968d9..4ff48baef 100644
--- a/src/engine/wavetable.h
+++ b/src/engine/wavetable.h
@@ -1,7 +1,13 @@
+#ifndef _WAVETABLE_H
+#define _WAVETABLE_H
+#include "safeWriter.h"
+
 struct DivWavetable {
   int len, min, max;
   int data[256];
 
+  void putWaveData(SafeWriter* w);
+  bool save(const char* path);
   DivWavetable():
     len(32),
     min(0),
@@ -11,3 +17,5 @@ struct DivWavetable {
     }
   }
 };
+
+#endif
\ No newline at end of file
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 55798182f..266868271 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -147,10 +147,10 @@ bool FurnaceGUI::decodeNote(const char* what, short& note, short& octave) {
     if (strcmp(what,noteNames[i])==0) {
       if ((i%12)==0) {
         note=12;
-        octave=(i/12)-1;
+        octave=(unsigned char)((i/12)-6);
       } else {
         note=i%12;
-        octave=i/12;
+        octave=(unsigned char)((i/12)-5);
       }
       return true;
     }