diff --git a/src/projectM-engine/CustomShape.cpp b/src/projectM-engine/CustomShape.cpp
index a0aa366c3..1bdc641cc 100755
--- a/src/projectM-engine/CustomShape.cpp
+++ b/src/projectM-engine/CustomShape.cpp
@@ -55,207 +55,207 @@ CustomShape::CustomShape ( int id ) : imageUrl("")
 
 	/* Start: Load custom shape parameters */
 	param = Param::new_param_float ( "r", P_FLAG_NONE, &this->r, NULL, 1.0, 0.0, 0.5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "g", P_FLAG_NONE, &this->g, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "b", P_FLAG_NONE, &this->b, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "a", P_FLAG_NONE, &this->a, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "border_r", P_FLAG_NONE, &this->border_r, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "border_g", P_FLAG_NONE, &this->border_g, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "border_b", P_FLAG_NONE, &this->border_b, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "border_a", P_FLAG_NONE, &this->border_a, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "r2", P_FLAG_NONE, &this->r2, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "g2", P_FLAG_NONE, &this->g2, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "b2", P_FLAG_NONE, &this->b2, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "a2", P_FLAG_NONE, &this->a2, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "x", P_FLAG_NONE, &this->x, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "y", P_FLAG_NONE, &this->y, NULL, 1.0, 0.0, .5 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_bool ( "thickoutline", P_FLAG_NONE, &this->thickOutline, 1, 0, 0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_bool ( "enabled", P_FLAG_NONE, &this->enabled, 1, 0, 0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_int ( "sides", P_FLAG_NONE, &this->sides, 100, 3, 3 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_bool ( "additive", P_FLAG_NONE, &this->additive, 1, 0, 0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_bool ( "textured", P_FLAG_NONE, &this->textured, 1, 0, 0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "rad", P_FLAG_NONE, &this->radius, NULL, MAX_DOUBLE_SIZE, 0, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort(); 
 	}
 	param = Param::new_param_float ( "ang", P_FLAG_NONE, &this->ang, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "tex_zoom", P_FLAG_NONE, &this->tex_zoom, NULL, MAX_DOUBLE_SIZE, .00000000001, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "tex_ang", P_FLAG_NONE, &this->tex_ang, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 
 	param = Param::new_param_float ( "t1", P_FLAG_TVAR, &this->t1, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t2", P_FLAG_TVAR, &this->t2, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t3", P_FLAG_TVAR, &this->t3, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t4", P_FLAG_TVAR, &this->t4, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t5", P_FLAG_TVAR, &this->t5, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t6", P_FLAG_TVAR, &this->t6, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();		
 	}
 	param = Param::new_param_float ( "t7", P_FLAG_TVAR, &this->t7, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "t8", P_FLAG_TVAR, &this->t8, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 
 	param = Param::new_param_float ( "q1", P_FLAG_QVAR, &this->q1, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q2", P_FLAG_QVAR, &this->q2, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q3", P_FLAG_QVAR, &this->q3, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q4", P_FLAG_QVAR, &this->q4, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q5", P_FLAG_QVAR, &this->q5, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q6", P_FLAG_QVAR, &this->q6, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q7", P_FLAG_QVAR, &this->q7, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 	param = Param::new_param_float ( "q8", P_FLAG_QVAR, &this->q8, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0 );
-	if ( ParamUtils::insert ( param, &this->param_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->param_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 
 	param = Param::new_param_string ( "imageurl", P_FLAG_NONE, &this->imageUrl);
-	if ( ParamUtils::insert ( param, &this->text_properties_tree ) < 0 )
+	if ( !ParamUtils::insert( param, &this->text_properties_tree ) )
 	{
-		DWRITE ( "%s\n", "failed to insert param!" );
+		abort();
 	}
 
 }
diff --git a/src/projectM-engine/CustomWave.cpp b/src/projectM-engine/CustomWave.cpp
index 2ebbedee2..9572c2213 100755
--- a/src/projectM-engine/CustomWave.cpp
+++ b/src/projectM-engine/CustomWave.cpp
@@ -56,11 +56,9 @@ CustomWave::CustomWave(int _id):
     bAdditive(0),
 
     scaling(1.0),
-    smoothing(0.0),
+    smoothing(0.0)
+
 
-    per_point_eqn_string_index(0),
-    per_frame_eqn_string_index(0),
-    per_frame_init_eqn_string_index(0)
 
 {
 
@@ -81,7 +79,7 @@ CustomWave::CustomWave(int _id):
  
   if ((param = Param::new_param_float("r", P_FLAG_NONE | P_FLAG_PER_POINT, &this->r, this->r_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
@@ -94,21 +92,21 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_float("g", P_FLAG_NONE | P_FLAG_PER_POINT, &this->g,  this->g_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if (ParamUtils::insert(param, &param_tree) < 0)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if ((param = Param::new_param_float("b", P_FLAG_NONE | P_FLAG_PER_POINT, &this->b,  this->b_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
 
@@ -116,49 +114,49 @@ CustomWave::CustomWave(int _id):
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if ((param = Param::new_param_float("a", P_FLAG_NONE | P_FLAG_PER_POINT, &this->a,  this->a_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if ((param = Param::new_param_float("x", P_FLAG_NONE | P_FLAG_PER_POINT, &this->x,  this->x_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if ((param = Param::new_param_float("y", P_FLAG_NONE | P_FLAG_PER_POINT, &this->y,  this->y_mesh, 1.0, 0.0, .5)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
 
     /// @bug make exception
     abort();
@@ -167,7 +165,7 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_bool("enabled", P_FLAG_NONE, &this->enabled, 1, 0, 0)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
 
@@ -176,7 +174,7 @@ CustomWave::CustomWave(int _id):
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
 
     /// @bug make exception
     abort();
@@ -185,7 +183,7 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_int("sep", P_FLAG_NONE, &this->sep, 100, -100, 0)) == NULL)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
 
@@ -194,7 +192,7 @@ CustomWave::CustomWave(int _id):
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     /// @bug make exception
     abort();
 
@@ -203,7 +201,6 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_bool("bspectrum", P_FLAG_NONE, &this->bSpectrum, 1, 0, 0)) == NULL)
   {
-    delete(this);
     /// @bug make exception
     abort();
 
@@ -212,7 +209,6 @@ CustomWave::CustomWave(int _id):
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     /// @bug make exception
     abort();
 
@@ -220,16 +216,12 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_bool("bdrawthick", P_FLAG_NONE, &this->bDrawThick, 1, 0, 0)) == NULL)
   {
-    delete(this);
     /// @bug make exception
     abort();
-
-
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     /// @bug make exception
     abort();
 
@@ -237,192 +229,181 @@ CustomWave::CustomWave(int _id):
 
   if ((param = Param::new_param_bool("busedots", P_FLAG_NONE, &this->bUseDots, 1, 0, 0)) == NULL)
   {
-    delete(this);
+ 
     /// @bug make exception
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_bool("badditive", P_FLAG_NONE, &this->bAdditive, 1, 0, 0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_int("samples", P_FLAG_NONE, &this->samples, 2048, 1, 512)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("sample", P_FLAG_READONLY | P_FLAG_NONE | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT,
                                       &this->sample, this->sample_mesh, 1.0, 0.0, 0.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    printf("failed to insert sample\n");
-    delete(this);
     abort();
   }
 
   if ((param = Param::new_param_float("value1", P_FLAG_READONLY | P_FLAG_NONE | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT, &this->v1, this->value1, 1.0, -1.0, 0.0)) == NULL)
   {
-    delete(this);
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     abort();
   }
 
   if ((param = Param::new_param_float("value2", P_FLAG_READONLY | P_FLAG_NONE | P_FLAG_ALWAYS_MATRIX | P_FLAG_PER_POINT, &this->v2, this->value2, 1.0, -1.0, 0.0)) == NULL)
   {
-    delete(this);
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("smoothing", P_FLAG_NONE, &this->smoothing, NULL, 1.0, 0.0, 0.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("scaling", P_FLAG_NONE, &this->scaling, NULL, MAX_DOUBLE_SIZE, 0.0, 1.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("t1", P_FLAG_PER_POINT | P_FLAG_TVAR, &this->t1, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("t2",  P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t2, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     abort();
   }
 
   if ((param = Param::new_param_float("t3",  P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t3, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+
     abort();
   }
   if ((param = Param::new_param_float("t4",  P_FLAG_PER_POINT |P_FLAG_TVAR, &this->t4, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
+
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     abort();
   }
   if ((param = Param::new_param_float("t5", P_FLAG_TVAR, &this->t5, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
     abort();
   }
   if ((param = Param::new_param_float("t6", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t6, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+
     abort();
   }
   if ((param = Param::new_param_float("t7", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t7, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
+    
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if ((param = Param::new_param_float("t8", P_FLAG_TVAR | P_FLAG_PER_POINT, &this->t8, NULL, MAX_DOUBLE_SIZE, -MAX_DOUBLE_SIZE, 0.0)) == NULL)
   {
-    delete(this);
+    ;
     abort();
   }
 
   if (ParamUtils::insert(param, &this->param_tree) < 0)
   {
-    delete(this);
+    ;
     abort();
   }
 
diff --git a/src/projectM-engine/CustomWave.hpp b/src/projectM-engine/CustomWave.hpp
index 7226f8a7a..7cda9145d 100755
--- a/src/projectM-engine/CustomWave.hpp
+++ b/src/projectM-engine/CustomWave.hpp
@@ -126,11 +126,6 @@ public:
     int per_frame_eqn_string_index;
     int per_frame_init_eqn_string_index;
 
-    /* String buffers for per point and per frame equations */
-    char per_point_eqn_string_buffer[STRING_BUFFER_SIZE];
-    char per_frame_eqn_string_buffer[STRING_BUFFER_SIZE];
-    char per_frame_init_eqn_string_buffer[STRING_BUFFER_SIZE];
-
     int add_per_point_eqn(char * name, GenExpr * gen_expr);
     void evalCustomWaveInitConditions(Preset *preset);
     void evalPerPointEqns();
diff --git a/src/projectM-engine/Parser.cpp b/src/projectM-engine/Parser.cpp
index 41450ac01..878ce7650 100755
--- a/src/projectM-engine/Parser.cpp
+++ b/src/projectM-engine/Parser.cpp
@@ -2133,8 +2133,6 @@ int Parser::parse_wave_helper(std::istream &  fs, Preset  * preset, int id, char
     /* Insert the equation in the per frame equation tree */
     custom_wave->per_frame_init_eqn_tree.insert(std::make_pair(init_cond->param->name,init_cond));
 
-    if (update_string_buffer(custom_wave->per_frame_init_eqn_string_buffer,
-                             &custom_wave->per_frame_init_eqn_string_index) < 0)
     {
       if (PARSE_DEBUG) printf("parse_wave_helper: failed to update string buffer (LINE %d)\n", line_count);
       return PROJECTM_FAILURE;
@@ -2203,9 +2201,6 @@ int Parser::parse_wave_helper(std::istream &  fs, Preset  * preset, int id, char
     /* Need to add stuff to string buffer so the editor can read the equations.
        Why not make a nice little helper function for this? - here it is: */
 
-    if (update_string_buffer(custom_wave->per_frame_eqn_string_buffer, &custom_wave->per_frame_eqn_string_index) < 0)
-      return PROJECTM_FAILURE;
-
     line_mode = CUSTOM_WAVE_PER_FRAME_LINE_MODE;
     return PROJECTM_SUCCESS;
   }
@@ -2251,8 +2246,7 @@ int Parser::parse_wave_helper(std::istream &  fs, Preset  * preset, int id, char
     // This tells the parser we are no longer parsing a custom wave
     current_wave = NULL;
 
-    if (update_string_buffer(custom_wave->per_point_eqn_string_buffer, &custom_wave->per_point_eqn_string_index) < 0)
-      return PROJECTM_FAILURE;
+   
 
     line_mode = CUSTOM_WAVE_PER_POINT_LINE_MODE;
     if (PARSE_DEBUG) printf("parse_wave_helper (per_point): [finished] (custom wave id = %d)\n", custom_wave->id);
@@ -2554,9 +2548,6 @@ int Parser::parse_wave_per_frame_eqn(std::istream &  fs, CustomWave * custom_wav
   /* Need to add stuff to string buffer so the editor can read the equations.
      Why not make a nice little helper function for this? - here it is: */
 
-  if (update_string_buffer(custom_wave->per_frame_eqn_string_buffer, &custom_wave->per_frame_eqn_string_index) < 0)
-    return PROJECTM_FAILURE;
-
   line_mode = CUSTOM_WAVE_PER_FRAME_LINE_MODE;
   return PROJECTM_SUCCESS;
 }
diff --git a/src/projectM-engine/Preset.hpp b/src/projectM-engine/Preset.hpp
index 3dbbe5558..74c7eddac 100644
--- a/src/projectM-engine/Preset.hpp
+++ b/src/projectM-engine/Preset.hpp
@@ -119,7 +119,9 @@ public:
 
     return m_presetOutputs;
   }
-	/// Sets the descriptive name for this preset (typically the file name)
+
+    /// Sets the descriptive name for this preset (typically the file name)
+    /// \param theValue the new preset name to assign to the preset
 	void setPresetName ( const std::string& theValue )
 	{
 		m_presetName = theValue;
@@ -127,6 +129,7 @@ public:
 	
 
 	/// Gets the descriptive name for this preset (typically the file name)
+	/// \returns the name of the preset
 	std::string presetName() const
 	{
 		return m_presetName;