diff --git a/docs/AUTHORS b/docs/AUTHORS
index 409f2d97..f4002533 100644
--- a/docs/AUTHORS
+++ b/docs/AUTHORS
@@ -36,6 +36,7 @@ Tileset Desert2:    by Idanwin and Titus Tscharntke(titi)
 Tileset Winter:     by Titus Tscharntke(titi)
 Tileset Hell:       by Titus Tscharntke(titi)
 Tileset Mediterran: by Titus Tscharntke(titi)
+Tileset Scurbland:  by MadElf (improved a bit by titi)
 
 Maps:
 =====
diff --git a/mk/linux/configure.ac b/mk/linux/configure.ac
index ec06b014..7d0176c7 100644
--- a/mk/linux/configure.ac
+++ b/mk/linux/configure.ac
@@ -4,7 +4,7 @@
 #----------------------------------------------------------------------------
 AC_PREREQ([2.54])
 
-AC_INIT([megaglest], [3.2.4-1-beta2], [matze@braunis.de])
+AC_INIT([megaglest], [3.2.4-2-beta2], [matze@braunis.de])
 AC_CONFIG_SRCDIR([mk/jam/build.jam])
 AC_CONFIG_AUX_DIR([mk/autoconf])
 
diff --git a/source/glest_map_editor/main.cpp b/source/glest_map_editor/main.cpp
index 583009f6..bfa347b0 100644
--- a/source/glest_map_editor/main.cpp
+++ b/source/glest_map_editor/main.cpp
@@ -10,7 +10,7 @@ using namespace std;
 
 namespace Glest{ namespace MapEditor{
 
-const string MainWindow::versionString= "v1.3.0";
+const string MainWindow::versionString= "v1.3.1";
 const string MainWindow::winHeader= "Glest Map Editor " + versionString + " - Built: " + __DATE__;
 
 // ===============================================
@@ -108,19 +108,19 @@ MainWindow::MainWindow():
 	menuBrushObject->AppendCheckItem(miBrushObject+3, wxT("2 - DeadTree/Cactuses/Thornbush (unwalkable)"));
 	menuBrushObject->AppendCheckItem(miBrushObject+4, wxT("3 - Stone (unwalkable)"));
 	menuBrushObject->AppendCheckItem(miBrushObject+5, wxT("4 - Bush/Grass/Fern (walkable)"));
-	menuBrushObject->AppendCheckItem(miBrushObject+6, wxT("5 - Water Object/Reed/Papyrus (usually walkable)"));
-	menuBrushObject->AppendCheckItem(miBrushObject+7, wxT("6 - C1 BigTree/DeadTree/OldPalm (usually unwalkable/not harvestable)"));
+	menuBrushObject->AppendCheckItem(miBrushObject+6, wxT("5 - Water Object/Reed/Papyrus (walkable)"));
+	menuBrushObject->AppendCheckItem(miBrushObject+7, wxT("6 - C1 BigTree/DeadTree/OldPalm (unwalkable/not harvestable)"));
 	menuBrushObject->AppendCheckItem(miBrushObject+8, wxT("7 - C2 Hanged/Impaled (unwalkable)"));
 	menuBrushObject->AppendCheckItem(miBrushObject+9, wxT("8 - C3, Statues (unwalkable)"));
-	menuBrushObject->AppendCheckItem(miBrushObject+10, wxT("9 - Big Rock (Mountain)"));
-	menuBrushObject->AppendCheckItem(miBrushObject+11, wxT("10 - Invisible Blocking Object"));
+	menuBrushObject->AppendCheckItem(miBrushObject+10, wxT("9 - Big Rock (Mountain) (unwalkable)"));
+	menuBrushObject->AppendCheckItem(miBrushObject+11, wxT("10 - Invisible Blocking Object (unwalkable)"));
 	menuBrush->Append(miBrushObject, wxT("Object"), menuBrushObject);
 
 	//resources
 	menuBrushResource= new wxMenu();
 	menuBrushResource->AppendCheckItem(miBrushResource+1, wxT("0 - None"));
-	menuBrushResource->AppendCheckItem(miBrushResource+2, wxT("1 - gold"));
-	menuBrushResource->AppendCheckItem(miBrushResource+3, wxT("2 - stone"));
+	menuBrushResource->AppendCheckItem(miBrushResource+2, wxT("1 - gold  (unwalkable)"));
+	menuBrushResource->AppendCheckItem(miBrushResource+3, wxT("2 - stone (unwalkable)"));
 	menuBrushResource->AppendCheckItem(miBrushResource+4, wxT("3 - (not used yet)"));
 	menuBrushResource->AppendCheckItem(miBrushResource+5, wxT("4 - (not used yet)"));
 	menuBrushResource->AppendCheckItem(miBrushResource+6, wxT("5 - (not used yet)"));
@@ -128,10 +128,10 @@ MainWindow::MainWindow():
 
 	//players
 	menuBrushStartLocation= new wxMenu();
-	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+1, wxT("1 - Player 1 (red)"));
-	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+2, wxT("2 - Player 2 (blue)"));
-	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+3, wxT("3 - Player 3 (green)"));
-	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+4, wxT("4 - Player 4 (yellow)"));
+	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+1, wxT("1 - Player 1 "));
+	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+2, wxT("2 - Player 2 "));
+	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+3, wxT("3 - Player 3 "));
+	menuBrushStartLocation->AppendCheckItem(miBrushStartLocation+4, wxT("4 - Player 4 "));
 	menuBrush->Append(miBrushStartLocation, wxT("Player"), menuBrushStartLocation);
 
 	menuBar->Append(menuBrush, wxT("Brush"));
@@ -363,7 +363,7 @@ void MainWindow::onMenuMiscResetZoomAndPos(wxCommandEvent &event){
 }
 
 void MainWindow::onMenuMiscAbout(wxCommandEvent &event){
-	wxMessageDialog(NULL, wxT("Glest Map Editor - Copyright 2004 The Glest Team"), wxT("About")).ShowModal();
+	wxMessageDialog(NULL, wxT("Glest Map Editor - Copyright 2004 The Glest Team ( improved by titi )"), wxT("About")).ShowModal();
 }
 
 void MainWindow::onMenuMiscHelp(wxCommandEvent &event){
diff --git a/source/glest_map_editor/renderer.cpp b/source/glest_map_editor/renderer.cpp
index b6ecb703..79039221 100644
--- a/source/glest_map_editor/renderer.cpp
+++ b/source/glest_map_editor/renderer.cpp
@@ -151,10 +151,10 @@ void Renderer::renderMap(Map *map, int x, int y, int clientW, int clientH, int c
 	glLineWidth(3);
 	for (int i=0; i<map->getMaxPlayers(); i++){
 		switch(i){
-		case 0: glColor3f(1.f, 1.f, 0.f); break;
-		case 1: glColor3f(0.5f, 0.5f, 0.5f); break;
-		case 2: glColor3f(1.f, 0.f, 0.f); break;
-		case 3: glColor3f(0.f, 0.f, 1.f); break;
+		case 0: glColor3f(1.f, 0.f, 0.f); break;
+		case 1: glColor3f(0.f, 0.f, 1.f); break;
+		case 2: glColor3f(0.f, 1.f, 0.f); break;
+		case 3: glColor3f(1.f, 1.f, 0.f); break;
 		}
 		glBegin(GL_LINES);
 				glVertex2i((map->getStartLocationX(i)-1)*cellSize, clientH- (map->getStartLocationY(i)-1)*cellSize);
diff --git a/source/shared_lib/include/graphics/particle.h b/source/shared_lib/include/graphics/particle.h
index 031e27d7..7f9e0d92 100644
--- a/source/shared_lib/include/graphics/particle.h
+++ b/source/shared_lib/include/graphics/particle.h
@@ -226,7 +226,7 @@ public:
 	virtual void updateParticle(Particle *p);
 	virtual void update();
 	virtual void setTeamNumber(int teamNumber);
-	//virtual void render(ParticleRenderer *pr, ModelRenderer *mr);
+	virtual void render(ParticleRenderer *pr, ModelRenderer *mr);
 
 	//set params
 	void setRadius(float radius);
diff --git a/source/shared_lib/sources/graphics/particle.cpp b/source/shared_lib/sources/graphics/particle.cpp
index 063bd9ca..2e0bd9c9 100644
--- a/source/shared_lib/sources/graphics/particle.cpp
+++ b/source/shared_lib/sources/graphics/particle.cpp
@@ -305,8 +305,8 @@ UnitParticleSystem::UnitParticleSystem(int particleCount): ParticleSystem(partic
 	
 }
 
-/*void UnitParticleSystem::render(ParticleRenderer *pr,ModelRenderer *mr){
-	if(active){
+void UnitParticleSystem::render(ParticleRenderer *pr,ModelRenderer *mr){
+	//if(active){
 		switch(primitive){
 		case pQuad:
 			pr->renderSystem(this);
@@ -317,8 +317,8 @@ UnitParticleSystem::UnitParticleSystem(int particleCount): ParticleSystem(partic
 		default:
 			assert(false);
 		}
-	}
-}*/
+	//}
+}
 
 UnitParticleSystem::Primitive UnitParticleSystem::strToPrimitive(const string &str){
 	if(str=="quad"){
@@ -352,9 +352,11 @@ void UnitParticleSystem::initParticle(Particle *p, int particleIndex){
 	p->lastPos= pos;
 	oldPosition=pos;
 	p->size= particleSize;
-	p->speed= Vec3f(direction.x*speed+direction.x*speed*random.randRange(-0.5f, 0.5f),
-					 direction.y*speed+direction.y*speed*random.randRange(-0.5f, 0.5f),
-					 direction.z*speed+direction.z*speed*random.randRange(-0.5f, 0.5f));
+	
+	p->speed= Vec3f(direction.x+direction.x*random.randRange(-0.5f, 0.5f),
+					 direction.y+direction.y*random.randRange(-0.5f, 0.5f),
+					 direction.z+direction.z*random.randRange(-0.5f, 0.5f));
+	p->speed= p->speed * speed;
 	p->accel= Vec3f(0.0f, -gravity, 0.0f);
 	
 	if(!relative){
@@ -447,11 +449,11 @@ void UnitParticleSystem::setTeamNumber(int teamNumber){
 		tmpCol=Vec3f(1,1,0);
 	}
 	
-	if(teamcolorNoEnergy)
+	if(teamcolorEnergy)
 	{
 		this->color=Vec4f(tmpCol.x,tmpCol.y,tmpCol.z,this->color.w);
 	}
-	if(teamcolorEnergy)
+	if(teamcolorNoEnergy)
 	{
 		this->colorNoEnergy=Vec4f(tmpCol.x,tmpCol.y,tmpCol.z,this->colorNoEnergy.w);
 	}