--- a/Aquaria/Game.cpp	Sat Feb 19 11:57:24 2011 +0900
+++ b/Aquaria/Game.cpp	Sun Apr 03 03:05:24 2011 +0900
@@ -2722,7 +2722,7 @@
 	if (createSaveData)
 	{
 		int idx = dsq->game->getIdxForEntityType(type);
-		entitySaveData.push_back(EntitySaveData(e, idx, usePos.x, usePos.y, rot, e->getGroupID(), e->getID()));
+		entitySaveData.push_back(EntitySaveData(e, idx, usePos.x, usePos.y, rot, e->getGroupID(), e->getID(), e->name));
 	}
 
 	addRenderObject(e, e->layer);
@@ -5661,8 +5661,8 @@
 
 			if (e->idx == -1)
 			{
-				if (!e->e->name.empty())
-					os << e->e->name << " ";
+				if (!e->name.empty())
+					os << e->name << " ";
 				else
 					os << "INVALID" << " ";
 			}

--- a/Aquaria/Game.h	Sat Feb 19 11:57:24 2011 +0900
+++ b/Aquaria/Game.h	Sun Apr 03 03:05:24 2011 +0900
@@ -408,6 +408,7 @@
 	void update(float dt);
 	void prevElement();
 	void nextElement();
+	void doPrevElement();
 	Element *cycleElementNext(Element *e);
 	Element *cycleElementPrev(Element *e);
 	void selectZero();
@@ -609,9 +610,10 @@
 struct EntitySaveData
 {
 public:
-	EntitySaveData(Entity *e, int idx, int x, int y, int rot, int group, int id) : e(e), idx(idx), x(x), y(y), rot(rot), group(group), id(id) {}
+	EntitySaveData(Entity *e, int idx, int x, int y, int rot, int group, int id, const std::string &name) : e(e), idx(idx), x(x), y(y), rot(rot), group(group), id(id), name(name) {}
 	Entity *e;
 	int idx, x, y, rot, group, id;
+	std::string name;
 };
 
 class Game : public StateObject

--- a/Aquaria/SceneEditor.cpp	Sat Feb 19 11:57:24 2011 +0900
+++ b/Aquaria/SceneEditor.cpp	Sun Apr 03 03:05:24 2011 +0900
@@ -777,7 +777,7 @@
 
 	updateText();
 
-	prevElement();
+	doPrevElement();
 }
 
 void SceneEditor::alignHorz()
@@ -2986,24 +2986,29 @@
 		}
 		else 
 		{
-			int oldCur = curElement;
-			curElement--;
-			if (curElement < 0)
-				curElement = dsq->game->elementTemplates.size()-1;
-
-			if (dsq->game->elementTemplates[curElement].idx < 1024)
-			{
-				//int idx = dsq->game->elementTemplates[curElement].idx;
-				placer->setTexture(dsq->game->elementTemplates[curElement].gfx);
-			}
-			else
-			{
-				curElement = oldCur;
-			}
+			doPrevElement();
 		}
 	}
 }
 
+void SceneEditor::doPrevElement()
+{
+	int oldCur = curElement;
+	curElement--;
+	if (curElement < 0)
+		curElement = dsq->game->elementTemplates.size()-1;
+
+	if (dsq->game->elementTemplates[curElement].idx < 1024)
+	{
+		//int idx = dsq->game->elementTemplates[curElement].idx;
+		placer->setTexture(dsq->game->elementTemplates[curElement].gfx);
+	}
+	else
+	{
+		curElement = oldCur;
+	}
+}
+
 void SceneEditor::moveLayer()
 {
 	std::string s = dsq->getUserInputString("Enter 'fromLayer toLayer' (space inbetween, ESC/m-ty to cancel)");

--- a/BBGE/SkeletalSprite.cpp	Sat Feb 19 11:57:24 2011 +0900
+++ b/BBGE/SkeletalSprite.cpp	Sun Apr 03 03:05:24 2011 +0900
@@ -1291,8 +1291,6 @@
 		return;
 	}
 
-	stringToLower(file);
-
 	loaded = true;
 	
 	TiXmlDocument xml;