diff --git a/src/fx.cpp b/src/fx.cpp
index f2279dd..f879cc8 100644
--- a/src/fx.cpp
+++ b/src/fx.cpp
@@ -35,5 +35,5 @@ FX::~FX()
 
 void FXBase::prepare()
 {
-
+    // does nothing by default
 }
diff --git a/src/fx.h b/src/fx.h
index 4cc4dc4..ec23ad5 100644
--- a/src/fx.h
+++ b/src/fx.h
@@ -36,7 +36,6 @@ public:
     float32_t getSamplingRate() const;
 
     virtual void reset() = 0;
-    // virtual void prepare() = 0;
     virtual void prepare();
 
 private:
diff --git a/src/fx_components.h b/src/fx_components.h
index d250ecc..1d3443b 100644
--- a/src/fx_components.h
+++ b/src/fx_components.h
@@ -150,7 +150,7 @@ private:
 };
 
 
-typedef InterpolatedSineOscillator LFO;
+typedef ComplexLFO LFO;
 
 
 class JitterGenerator : public FXBase
diff --git a/src/test/test_fx_helper.cpp b/src/test/test_fx_helper.cpp
index 34d8d77..6ea3c0c 100644
--- a/src/test/test_fx_helper.cpp
+++ b/src/test/test_fx_helper.cpp
@@ -1,8 +1,8 @@
 #include "test_fx_helper.h"
 
-string getScenarioName(int scenario)
+std::string getScenarioName(int scenario)
 {
-    stringstream ss;
+    std::stringstream ss;
 
     bool fxTube = Active(scenario, FXSwitch::FX__Tube);
     bool fxChorus = Active(scenario, FXSwitch::FX__Chorus);
@@ -26,56 +26,49 @@ string getScenarioName(int scenario)
     if(fxChorus) 
     {
         if(!first) ss << ", ";
-        ss << "Chorus";
+        ss << "Chrs";
         first = false;
     }
 
     if(fxPhaser) 
     {
         if(!first) ss << ", ";
-        ss << "Phaser";
+        ss << "Phsr";
         first = false;
     }
 
     if(fxOrbitone) 
     {
         if(!first) ss << ", ";
-        ss << "Orbitone";
+        ss << "Orbt";
         first = false;
     }
 
     if(fxFlanger) 
     {
         if(!first) ss << ", ";
-        ss << "Flanger";
+        ss << "Flgr";
         first = false;
     }
 
     if(fxDelay) 
     {
         if(!first) ss << ", ";
-        ss << "Delay";
-        first = false;
-    }
-
-    if(fxDelay) 
-    {
-        if(!first) ss << ", ";
-        ss << "Delay";
+        ss << "Dely";
         first = false;
     }
 
     if(fxReverb) 
     {
         if(!first) ss << ", ";
-        ss << "Reverb";
+        ss << "Revb";
         first = false;
     }
 
     if(fxShimmer) 
     {
         if(!first) ss << ", ";
-        ss << "Shimmer";
+        ss << "Shim";
         first = false;
     }