diff --git a/Aquaria/Continuity.cpp b/Aquaria/Continuity.cpp
index 7e712a3..063dd8a 100644
--- a/Aquaria/Continuity.cpp
+++ b/Aquaria/Continuity.cpp
@@ -1392,6 +1392,10 @@ void Continuity::castSong(int num)
 	effect->setPositionSnapTo(&dsq->game->avatar->position);
 	dsq->game->addRenderObject(effect, LR_PARTICLES);
 
+
+	// song->script == 0: internal handler only
+	// song->script == 1: script handler only
+	// song->script == 2: both
 	if (song->script)
 	{
 		if (dsq->mod.isActive())
@@ -1399,7 +1403,8 @@ void Continuity::castSong(int num)
 		else
 			dsq->runScriptNum("songs.lua", "castSong", num);
 	}
-	else
+
+	if (song->script != 1)
 	{
 		switch((SongType)num)
 		{
diff --git a/Aquaria/DSQ.h b/Aquaria/DSQ.h
index d951255..5043f36 100644
--- a/Aquaria/DSQ.h
+++ b/Aquaria/DSQ.h
@@ -312,7 +312,7 @@ struct Song
 	Song() { index=0; script=0; }
 	int index;
 	SongNotes notes;
-	bool script;
+	int script;
 };
 
 const int MAX_FLAGS				= 1024;
diff --git a/Aquaria/Game.cpp b/Aquaria/Game.cpp
index de66c8b..cab97ab 100644
--- a/Aquaria/Game.cpp
+++ b/Aquaria/Game.cpp
@@ -6851,24 +6851,11 @@ void Game::bindInput()
 #ifdef AQUARIA_BUILD_SCENEEDITOR
 	if (dsq->canOpenEditor())
 	{
-		//addAction(MakeFunctionEvent(Game, toggleSceneEditor), KEY_TAB, 0);
 		addAction(ACTION_TOGGLESCENEEDITOR, KEY_TAB);
 	}
 #endif
 
 
-
-	/*
-	if (dsq->user.demo.warpKeys)
-	{
-		addAction(MakeFunctionEvent(Game, warpKey1), KEY_1, 1);
-		addAction(MakeFunctionEvent(Game, warpKey2), KEY_2, 1);
-		addAction(MakeFunctionEvent(Game, warpKey3), KEY_3, 1);
-		addAction(MakeFunctionEvent(Game, warpKey4), KEY_4, 1);
-	}
-	*/
-
-
 	dsq->user.control.actionSet.importAction(this, "PrimaryAction", ACTION_PRIMARY);
 
 	dsq->user.control.actionSet.importAction(this, "Escape",		ACTION_ESC);