diff --git a/src/projectM-engine/Eval.cpp b/src/projectM-engine/Eval.cpp
index b64ab5eb5..efcf6a1c1 100755
--- a/src/projectM-engine/Eval.cpp
+++ b/src/projectM-engine/Eval.cpp
@@ -67,15 +67,15 @@ int Eval::init_infix_ops() {
 int Eval::destroy_infix_ops()
 {
 
-  free(Eval::infix_add);
-  free(Eval::infix_minus);
-  free(Eval::infix_div);
-  free(Eval::infix_or);
-  free(Eval::infix_and);
-  free(Eval::infix_mod);
-  free(Eval::infix_mult);
-  free(Eval::infix_positive);
-  free(Eval::infix_negative);
+  delete(Eval::infix_add);
+  delete(Eval::infix_minus);
+  delete(Eval::infix_div);
+  delete(Eval::infix_or);
+  delete(Eval::infix_and);
+  delete(Eval::infix_mod);
+  delete(Eval::infix_mult);
+  delete(Eval::infix_positive);
+  delete(Eval::infix_negative);
 
   Eval::infix_add = NULL;
   Eval::infix_minus = NULL;
diff --git a/src/projectM-engine/Preset.cpp b/src/projectM-engine/Preset.cpp
index 67b3a8c41..a00a0685d 100755
--- a/src/projectM-engine/Preset.cpp
+++ b/src/projectM-engine/Preset.cpp
@@ -93,7 +93,7 @@ void Preset::evalCustomWaveInitConditions() {
 
 void Preset::evalCustomWavePerFrameEquations() {
 
-    for (cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) {
+    for (PresetOutputs::cwave_container::iterator pos = customWaves->begin(); pos != customWaves->end(); ++pos) {
     	(*pos)->init_cond_tree->splay_traverse((void (*)(void*))eval_init_cond_helper);
     	(*pos)->per_frame_eqn_tree->splay_traverse((void (*)(void*))eval_per_frame_eqn_helper);
    }
@@ -102,7 +102,7 @@ void Preset::evalCustomWavePerFrameEquations() {
 
 void Preset::evalCustomShapePerFrameEquations() {
 
-    for (cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) {
+    for (PresetOutputs::cshape_container::iterator pos = customShapes->begin(); pos != customShapes->end(); ++pos) {
     	(*pos)->init_cond_tree->splay_traverse((void (*)(void*))eval_init_cond_helper);
     	(*pos)->per_frame_eqn_tree->splay_traverse((void (*)(void*))eval_per_frame_eqn_helper);
    }
@@ -262,8 +262,11 @@ void Preset::initialize(const std::string & pathname) {
 
 }
 
+/// @bug broken / unimplemented
 void Preset::savePreset(char * filename) {
 
+return;
+
 #ifdef PANTS
   FILE * fs;
 
@@ -326,7 +329,7 @@ int Preset::write_preset_name(FILE * fs) {
     return PROJECTM_FAILURE;
 
   /* Format the preset name in a string */
-  sprintf(s, "[%s]\n", name);
+   sprintf(s, "[%s]\n", name);
 
   len = strlen(s);
 
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index 779cbb099..cfa87db90 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -146,8 +146,8 @@ private:
     void evalPerPixelEqns();
     void evalPerFrameEquations();
 
-    cwave_container * customWaves;
-    cshape_container * customShapes;
+    PresetOutputs::cwave_container * customWaves;
+    PresetOutputs::cshape_container * customShapes;
 
 };
 
diff --git a/src/projectM-engine/PresetFrameIO.hpp b/src/projectM-engine/PresetFrameIO.hpp
index f46f8b787..d41261dd6 100644
--- a/src/projectM-engine/PresetFrameIO.hpp
+++ b/src/projectM-engine/PresetFrameIO.hpp
@@ -5,14 +5,14 @@
 class CustomWave;
 class CustomShape;
 
-typedef std::vector<CustomWave*> cwave_container;
-typedef std::vector<CustomShape*> cshape_container;
 
 /** Container for all preset writeable engine variables. It's a struct
  * so that it's light weight. Access is done directly on
  * members for Mr. Sperl's convenience */
 class PresetOutputs {
 public:
+	typedef std::vector<CustomWave*> cwave_container;
+	typedef std::vector<CustomShape*> cshape_container;
 
     cwave_container customWaves;
     cshape_container customShapes;
diff --git a/src/projectM-engine/Renderer.cpp b/src/projectM-engine/Renderer.cpp
index 268ac6af4..3994a5749 100644
--- a/src/projectM-engine/Renderer.cpp
+++ b/src/projectM-engine/Renderer.cpp
@@ -584,7 +584,7 @@ void Renderer::draw_custom_waves(PresetOutputs *presetOutputs) {
   glPointSize(this->renderTarget->texsize < 512 ? 1 : this->renderTarget->texsize/512); 
 
   /// @bug SPERL: this is a starting point at least  
-  for (cwave_container::const_iterator pos = presetOutputs->customWaves.begin();
+  for (PresetOutputs::cwave_container::const_iterator pos = presetOutputs->customWaves.begin();
 	pos != presetOutputs->customWaves.end(); ++pos) 
     {
      
@@ -661,7 +661,7 @@ void Renderer::draw_shapes(PresetOutputs *presetOutputs) {
     glTranslatef( 0, 0, -1 );
   
 /// @bug SPERL: this is a starting point at least  
-  for (cshape_container::const_iterator pos = presetOutputs->customShapes.begin();
+  for (PresetOutputs::cshape_container::const_iterator pos = presetOutputs->customShapes.begin();
 	pos != presetOutputs->customShapes.end(); ++pos) 
     {
 
diff --git a/src/projectM-engine/projectM.h b/src/projectM-engine/projectM.h
index 83672c080..a6b073d74 100755
--- a/src/projectM-engine/projectM.h
+++ b/src/projectM-engine/projectM.h
@@ -68,7 +68,6 @@
 #include "event.h"
 #include "fatal.h"
 #include "PresetFrameIO.hpp"
-//#include "Preset.hpp"
 #include "Renderer.hpp"
 
 #include "PresetChooser.hpp"
@@ -82,10 +81,7 @@ class Renderer;
 class Preset;
 
 
-class PresetLoader;
-class PresetChooser;
 #include <memory>
-//#include "SplayTree.hpp"
 
 #ifdef WIN32
 #pragma warning (disable:4244)