diff --git a/software/lib/MMM/examples/Motion/_4_Theremin/_4_Theremin.ino b/software/lib/MMM/examples/Motion/_4_Theremin/_4_Theremin.ino
index bb08d7d..911d0a6 100644
--- a/software/lib/MMM/examples/Motion/_4_Theremin/_4_Theremin.ino
+++ b/software/lib/MMM/examples/Motion/_4_Theremin/_4_Theremin.ino
@@ -28,7 +28,7 @@ void loop(){
   Music.setFrequency(frequency);
   
   xB = analogRead(A0);
-  volume = -float(xB)/256.; // B position
+  volume = -float(xB)/1024.; // B position
   volume = pow(10,volume);
   Music.setGain(volume);
   
diff --git a/software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino b/software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
index 17bda07..f117850 100644
--- a/software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
+++ b/software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
@@ -1,8 +1,13 @@
 //FM synthes of a sort
+<<<<<<< HEAD:software/lib/MMM/examples/Motion/_8_FM/_8_FM.ino
 //hang on! (it's unstable and wants to limit cycle)
+=======
+//hang on!  it's unstable and wants to limit cycle
+
+#define BIT_DEPTH 8 // gives us 16 Waveforms
+>>>>>>> getting FM:software/apps/Modeling/FM/FM.ino
 
 #include <Music.h>
-#define BIT_DEPTH 8 // gives us 16 Waveforms
 
 #include <Motor.h>
 
diff --git a/software/lib/MMM/examples/Music/_2_waveform/_2_waveform.ino b/software/lib/MMM/examples/Music/_2_waveform/_2_waveform.ino
index 764cd06..147d865 100644
--- a/software/lib/MMM/examples/Music/_2_waveform/_2_waveform.ino
+++ b/software/lib/MMM/examples/Music/_2_waveform/_2_waveform.ino
@@ -11,7 +11,7 @@
 // You still need to call Music.init() in the setup() function below.
 #include <Music.h>
 
-int delayTime = 1000;
+int delayTime = 2000;
 int cnt = 0;
 long timeNow;
 long lastTime = 0;