diff --git a/core/assets/version.properties b/core/assets/version.properties
index cedc38472a..ad7d533aa9 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Sat Apr 14 13:49:06 EDT 2018
+#Sat Apr 14 20:43:56 EDT 2018
 version=release
-androidBuildCode=512
+androidBuildCode=513
 name=Mindustry
 code=3.5
 build=custom build
diff --git a/core/src/io/anuke/mindustry/entities/BulletType.java b/core/src/io/anuke/mindustry/entities/BulletType.java
index dca208c352..592854f9b2 100644
--- a/core/src/io/anuke/mindustry/entities/BulletType.java
+++ b/core/src/io/anuke/mindustry/entities/BulletType.java
@@ -168,8 +168,8 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b) {
-			Draw.color(Color.LIGHT_GRAY, Color.GRAY, b.fout());
-			Lines.stroke(2f - b.fout());
+			Draw.color(Color.LIGHT_GRAY, Color.GRAY, b.fin());
+			Lines.stroke(2f - b.fin());
 			Lines.lineAngleCenter(b.x, b.y, b.angle(), 2f);
 			Draw.reset();
 		}
@@ -325,7 +325,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b){
-			Draw.color(Color.WHITE, lightOrange, b.fin()/2f + 0.25f);
+			Draw.color(Color.WHITE, lightOrange, b.fout()/2f + 0.25f);
 			Lines.stroke(1.5f);
 			Lines.lineAngle(b.x, b.y, b.angle(), 3f);
 			Draw.reset();
@@ -337,7 +337,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b) {
-			float size = 3f - b.fout()*1f;
+			float size = 3f - b.fin()*1f;
 
 			Draw.color(Color.PURPLE, Color.WHITE, 0.8f);
 			Lines.stroke(1f);
@@ -356,8 +356,8 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 			Draw.color(lightOrange, Color.WHITE, 0.4f);
 			Lines.poly(b.x, b.y, 3, 1.6f, b.angle());
 			Lines.stroke(1f);
-			Draw.color(Color.WHITE, lightOrange, b.fout()/2f);
-			Draw.alpha(b.fout());
+			Draw.color(Color.WHITE, lightOrange, b.fin()/2f);
+			Draw.alpha(b.fin());
 			Lines.spikes(b.x, b.y, 1.5f, 2f, 6);
 			Draw.reset();
 		}
@@ -408,9 +408,9 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b) {
-			Draw.color(Color.WHITE, Color.ORANGE, b.fout());
+			Draw.color(Color.WHITE, Color.ORANGE, b.fin());
 			Lines.stroke(2f);
-			Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fin()*5f);
+			Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fout()*5f);
 			Draw.reset();
 		}
 
@@ -436,9 +436,9 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b) {
-			Draw.color(Color.WHITE, Color.ORANGE, b.fout());
+			Draw.color(Color.WHITE, Color.ORANGE, b.fin());
 			Lines.stroke(1f);
-			Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fin()*4f);
+			Lines.lineAngleCenter(b.x, b.y, b.angle(), b.fout()*4f);
 			Draw.reset();
 		}
 	},
@@ -454,7 +454,7 @@ public abstract class BulletType extends BaseBulletType<Bullet>{
 		}
 
 		public void draw(Bullet b) {
-			float f = b.fin()*1.5f;
+			float f = b.fout()*1.5f;
 
 			Draw.color(beam);
 			Draw.rect("circle", b.x, b.y, 6f*f, 6f*f);
diff --git a/core/src/io/anuke/mindustry/entities/effect/EMP.java b/core/src/io/anuke/mindustry/entities/effect/EMP.java
index b8301e87d6..e7afc7b366 100644
--- a/core/src/io/anuke/mindustry/entities/effect/EMP.java
+++ b/core/src/io/anuke/mindustry/entities/effect/EMP.java
@@ -77,7 +77,7 @@ public class EMP extends TimedEntity{
 			
 			drawLine(target.worldx(), target.worldy());
 			
-			float rad = 5f*fin();
+			float rad = 5f*fout();
 			Draw.rect("circle", target.worldx(), target.worldy(), rad, rad);
 		}
 		
@@ -86,7 +86,7 @@ public class EMP extends TimedEntity{
 			drawLine(x + tr.x, y + tr.y);
 		}
 	
-		Lines.stroke(fin()*2f);
+		Lines.stroke(fout()*2f);
 		Lines.poly(x, y, 34, radius * tilesize);
 		
 		Draw.reset();
@@ -114,7 +114,7 @@ public class EMP extends TimedEntity{
 	}
 	
 	private void drawLaser(float x, float y, float x2, float y2){
-		Lines.stroke(fin() * 2f);
+		Lines.stroke(fout() * 2f);
 		Lines.line(x, y, x2, y2);
 	}
 }
diff --git a/core/src/io/anuke/mindustry/graphics/Fx.java b/core/src/io/anuke/mindustry/graphics/Fx.java
index 8a92890190..f1315889a2 100644
--- a/core/src/io/anuke/mindustry/graphics/Fx.java
+++ b/core/src/io/anuke/mindustry/graphics/Fx.java
@@ -27,27 +27,27 @@ public class Fx{
 	public static final Effect
 	
 	generatorexplosion = new Effect(28, 40f, e -> {
-		Angles.randLenVectors(e.id, 16, 10f + e.fout()*8f, (x, y)->{
-			float size = e.fin()*12f + 1f;
-			Draw.color(Color.WHITE, lightOrange, e.fout());
+		Angles.randLenVectors(e.id, 16, 10f + e.fin()*8f, (x, y)->{
+			float size = e.fout()*12f + 1f;
+			Draw.color(Color.WHITE, lightOrange, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 	}),
 	
 	reactorsmoke = new Effect(17, e -> {
-		Angles.randLenVectors(e.id, 4, e.fout()*8f, (x, y)->{
-			float size = 1f+e.fin()*5f;
-			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fout());
+		Angles.randLenVectors(e.id, 4, e.fin()*8f, (x, y)->{
+			float size = 1f+e.fout()*5f;
+			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 	}),
 	
 	nuclearsmoke = new Effect(40, e -> {
-		Angles.randLenVectors(e.id, 4, e.fout()*13f, (x, y)->{
+		Angles.randLenVectors(e.id, 4, e.fin()*13f, (x, y)->{
 			float size = e.finpow()*4f;
-			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fout());
+			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
@@ -55,97 +55,97 @@ public class Fx{
 	
 	nuclearcloud = new Effect(90, 200f, e -> {
 		Angles.randLenVectors(e.id, 10, e.finpow()*90f, (x, y)->{
-			float size = e.fin()*14f;
-			Draw.color(Color.LIME, Color.GRAY, e.fout());
+			float size = e.fout()*14f;
+			Draw.color(Color.LIME, Color.GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 	}),
 	
 	chainshot = new Effect(9f, e -> {
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Lines.stroke(e.fin()*4f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*7f);
-		Lines.stroke(e.fin()*2f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*10f);
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Lines.stroke(e.fout()*4f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*7f);
+		Lines.stroke(e.fout()*2f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*10f);
 		Draw.reset();
 	}),
 	
 	mortarshot = new Effect(10f, e -> {
-		Draw.color(Color.WHITE, Color.DARK_GRAY, e.fout());
-		Lines.stroke(e.fin()*6f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*10f);
-		Lines.stroke(e.fin()*5f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*14f);
-		Lines.stroke(e.fin()*1f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*16f);
+		Draw.color(Color.WHITE, Color.DARK_GRAY, e.fin());
+		Lines.stroke(e.fout()*6f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*10f);
+		Lines.stroke(e.fout()*5f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*14f);
+		Lines.stroke(e.fout()*1f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*16f);
 		Draw.reset();
 	}),
 	
 	railshot = new Effect(9f, e -> {
-		Draw.color(Color.WHITE, Color.DARK_GRAY, e.fout());
-		Lines.stroke(e.fin()*5f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*8f);
-		Lines.stroke(e.fin()*4f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*12f);
-		Lines.stroke(e.fin()*1f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*14f);
+		Draw.color(Color.WHITE, Color.DARK_GRAY, e.fin());
+		Lines.stroke(e.fout()*5f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*8f);
+		Lines.stroke(e.fout()*4f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*12f);
+		Lines.stroke(e.fout()*1f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*14f);
 		Draw.reset();
 	}),
 	
 	titanshot = new Effect(12f, e -> {
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Lines.stroke(e.fin()*7f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*12f);
-		Lines.stroke(e.fin()*4f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*16f);
-		Lines.stroke(e.fin()*2f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*18f);
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Lines.stroke(e.fout()*7f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*12f);
+		Lines.stroke(e.fout()*4f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*16f);
+		Lines.stroke(e.fout()*2f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*18f);
 		Draw.reset();
 	}),
 	
 	largeCannonShot = new Effect(11f, e -> {
-		Draw.color(Color.WHITE, whiteYellow, e.fout());
-		Lines.stroke(e.fin()*6f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*12f);
-		Lines.stroke(e.fin()*3f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*16f);
-		Lines.stroke(e.fin()*1f);
-		Lines.lineAngle(e.x, e.y, e.rotation, e.fin()*18f);
+		Draw.color(Color.WHITE, whiteYellow, e.fin());
+		Lines.stroke(e.fout()*6f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*12f);
+		Lines.stroke(e.fout()*3f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*16f);
+		Lines.stroke(e.fout()*1f);
+		Lines.lineAngle(e.x, e.y, e.rotation, e.fout()*18f);
 		Draw.reset();
 	}),
 	
 	shockwave = new Effect(10f, 80f, e -> {
-		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fout());
-		Lines.stroke(e.fin()*2f + 0.2f);
-		Lines.circle(e.x, e.y, e.fout()*28f);
+		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+		Lines.stroke(e.fout()*2f + 0.2f);
+		Lines.circle(e.x, e.y, e.fin()*28f);
 		Draw.reset();
 	}),
 	
 	nuclearShockwave = new Effect(10f, 200f, e -> {
-		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fout());
-		Lines.stroke(e.fin()*3f + 0.2f);
-		Lines.poly(e.x, e.y, 40, e.fout()*140f);
+		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+		Lines.stroke(e.fout()*3f + 0.2f);
+		Lines.poly(e.x, e.y, 40, e.fin()*140f);
 		Draw.reset();
 	}),
 	
 	shockwaveSmall = new Effect(10f, e -> {
-		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fout());
-		Lines.stroke(e.fin()*2f + 0.1f);
-		Lines.circle(e.x, e.y, e.fout()*15f);
+		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+		Lines.stroke(e.fout()*2f + 0.1f);
+		Lines.circle(e.x, e.y, e.fin()*15f);
 		Draw.reset();
 	}),
 	
 	empshockwave = new Effect(7f, e -> {
-		Draw.color(Color.WHITE, Color.SKY, e.fout());
-		Lines.stroke(e.fin()*2f);
-		Lines.circle(e.x, e.y, e.fout()*40f);
+		Draw.color(Color.WHITE, Color.SKY, e.fin());
+		Lines.stroke(e.fout()*2f);
+		Lines.circle(e.x, e.y, e.fin()*40f);
 		Draw.reset();
 	}),
 	
 	empspark = new Effect(13, e -> {
-		Angles.randLenVectors(e.id, 7, 1f + e.fout()*12f, (x, y)->{
-			float len = 1f+e.fin()*6f;
+		Angles.randLenVectors(e.id, 7, 1f + e.fin()*12f, (x, y)->{
+			float len = 1f+e.fout()*6f;
 			Draw.color(Color.SKY);
 			Lines.lineAngle(e.x + x, e.y + y, Mathf.atan2(x, y), len);
 			Draw.reset();
@@ -153,67 +153,67 @@ public class Fx{
 	}),
 	
 	redgeneratespark = new Effect(18, e -> {
-		Angles.randLenVectors(e.id, 5, e.fout()*8f, (x, y)->{
-			float len = e.fin()*4f;
-			Draw.color(Color.valueOf("fbb97f"), Color.GRAY, e.fout());
-			//Draw.alpha(e.fin());
+		Angles.randLenVectors(e.id, 5, e.fin()*8f, (x, y)->{
+			float len = e.fout()*4f;
+			Draw.color(Color.valueOf("fbb97f"), Color.GRAY, e.fin());
+			//Draw.alpha(e.fout());
 			Draw.rect("circle", e.x + x, e.y + y, len, len);
 			Draw.reset();
 		});
 	}),
 	
 	generatespark = new Effect(18, e -> {
-		Angles.randLenVectors(e.id, 5, e.fout()*8f, (x, y)->{
-			float len = e.fin()*4f;
-			Draw.color(Color.valueOf("d2b29c"), Color.GRAY, e.fout());
-					//Draw.alpha(e.fin());
+		Angles.randLenVectors(e.id, 5, e.fin()*8f, (x, y)->{
+			float len = e.fout()*4f;
+			Draw.color(Color.valueOf("d2b29c"), Color.GRAY, e.fin());
+					//Draw.alpha(e.fout());
 			Draw.rect("circle", e.x + x, e.y + y, len, len);
 			Draw.reset();
 		});
 	}),
 
 	fuelburn = new Effect(23, e -> {
-		Angles.randLenVectors(e.id, 5, e.fout()*9f, (x, y)->{
-			float len = e.fin()*4f;
-			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fout());
-			//Draw.alpha(e.fin());
+		Angles.randLenVectors(e.id, 5, e.fin()*9f, (x, y)->{
+			float len = e.fout()*4f;
+			Draw.color(Color.LIGHT_GRAY, Color.GRAY, e.fin());
+			//Draw.alpha(e.fout());
 			Draw.rect("circle", e.x + x, e.y + y, len, len);
 			Draw.reset();
 		});
 	}),
 	
 	laserspark = new Effect(14, e -> {
-		Angles.randLenVectors(e.id, 8, 1f + e.fout()*11f, (x, y)->{
-			float len = 1f+e.fin()*5f;
-			Draw.color(Color.WHITE, Color.CORAL, e.fout());
-			Draw.alpha(e.fout()/1.3f);
+		Angles.randLenVectors(e.id, 8, 1f + e.fin()*11f, (x, y)->{
+			float len = 1f+e.fout()*5f;
+			Draw.color(Color.WHITE, Color.CORAL, e.fin());
+			Draw.alpha(e.fin()/1.3f);
 			Lines.lineAngle(e.x + x, e.y + y, Mathf.atan2(x, y), len);
 			Draw.reset();
 		});
 	}),
 	
 	shellsmoke = new Effect(20, e -> {
-		Angles.randLenVectors(e.id, 8, 3f + e.fout()*17f, (x, y)->{
-			float size = 2f+e.fin()*5f;
-			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fout());
+		Angles.randLenVectors(e.id, 8, 3f + e.fin()*17f, (x, y)->{
+			float size = 2f+e.fout()*5f;
+			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 	}),
 	
 	blastsmoke = new Effect(26, e -> {
-		Angles.randLenVectors(e.id, 12, 1f + e.fout()*23f, (x, y)->{
-			float size = 2f+e.fin()*6f;
-			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fout());
+		Angles.randLenVectors(e.id, 12, 1f + e.fin()*23f, (x, y)->{
+			float size = 2f+e.fout()*6f;
+			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 	}),
 	
 	lava = new Effect(18, e -> {
-		Angles.randLenVectors(e.id, 3, 1f + e.fout()*10f, (x, y)->{
+		Angles.randLenVectors(e.id, 3, 1f + e.fin()*10f, (x, y)->{
 			float size = e.finpow()*4f;
-			Draw.color(Color.ORANGE, Color.GRAY, e.fout());
+			Draw.color(Color.ORANGE, Color.GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
@@ -222,194 +222,194 @@ public class Fx{
 	lavabubble = new Effect(45f, e -> {
 		Draw.color(Color.ORANGE);
 		float scl = 0.35f;
-		Lines.stroke(1f - Mathf.clamp(e.fout() - (1f-scl)) * (1f/scl));
-		Lines.circle(e.x, e.y, e.fout()*4f);
+		Lines.stroke(1f - Mathf.clamp(e.fin() - (1f-scl)) * (1f/scl));
+		Lines.circle(e.x, e.y, e.fin()*4f);
 		Draw.reset();
 	}),
 	
 	oilbubble = new Effect(64f, e -> {
 		Draw.color(Color.DARK_GRAY);
 		float scl = 0.25f;
-		Lines.stroke(1f - Mathf.clamp(e.fout() - (1f-scl)) * (1f/scl));
-		Lines.circle(e.x, e.y, e.fout()*3f);
+		Lines.stroke(1f - Mathf.clamp(e.fin() - (1f-scl)) * (1f/scl));
+		Lines.circle(e.x, e.y, e.fin()*3f);
 		Draw.reset();
 	}),
 	
 	shellexplosion = new Effect(9, e -> {
-		Lines.stroke(2f - e.fout()*1.7f);
-		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fout());
-		Lines.circle(e.x, e.y, 3f + e.fout() * 9f);
+		Lines.stroke(2f - e.fin()*1.7f);
+		Draw.color(Color.WHITE, Color.LIGHT_GRAY, e.fin());
+		Lines.circle(e.x, e.y, 3f + e.fin() * 9f);
 		Draw.reset();
 	}),
 	
 	blastexplosion = new Effect(14, e -> {
-		Lines.stroke(1.2f - e.fout());
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Lines.circle(e.x, e.y, 1.5f + e.fout() * 9f);
+		Lines.stroke(1.2f - e.fin());
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Lines.circle(e.x, e.y, 1.5f + e.fin() * 9f);
 		Draw.reset();
 	}),
 	
 	place = new Effect(16, e -> {
-		Lines.stroke(3f - e.fout() * 2f);
-		Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 3f);
+		Lines.stroke(3f - e.fin() * 2f);
+		Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 3f);
 		Draw.reset();
 	}),
 	
 	dooropen = new Effect(10, e -> {
-		Lines.stroke(e.fin() * 1.6f);
-		Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f);
-		Draw.reset();
-	}),
-	
-	doorclose= new Effect(10, e -> {
-		Lines.stroke(e.fin() * 1.6f);
+		Lines.stroke(e.fout() * 1.6f);
 		Lines.square(e.x, e.y, tilesize / 2f + e.fin() * 2f);
 		Draw.reset();
 	}),
 	
+	doorclose= new Effect(10, e -> {
+		Lines.stroke(e.fout() * 1.6f);
+		Lines.square(e.x, e.y, tilesize / 2f + e.fout() * 2f);
+		Draw.reset();
+	}),
+	
 	dooropenlarge = new Effect(10, e -> {
-		Lines.stroke(e.fin() * 1.6f);
-		Lines.square(e.x, e.y, tilesize + e.fout() * 2f);
+		Lines.stroke(e.fout() * 1.6f);
+		Lines.square(e.x, e.y, tilesize + e.fin() * 2f);
 		Draw.reset();
 	}),
 			
 	doorcloselarge = new Effect(10, e -> {
-		Lines.stroke(e.fin() * 1.6f);
-		Lines.square(e.x, e.y, tilesize + e.fin() * 2f);
+		Lines.stroke(e.fout() * 1.6f);
+		Lines.square(e.x, e.y, tilesize + e.fout() * 2f);
 		Draw.reset();
 	}),
 	
 	purify = new Effect(10, e -> {
-		Draw.color(Color.ROYAL, Color.GRAY, e.fout());
+		Draw.color(Color.ROYAL, Color.GRAY, e.fin());
 		Lines.stroke(2f);
-		Lines.spikes(e.x, e.y, e.fout() * 4f, 2, 6);
+		Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
 		Draw.reset();
 	}),
 	
 	purifyoil = new Effect(10, e -> {
-		Draw.color(Color.BLACK, Color.GRAY, e.fout());
+		Draw.color(Color.BLACK, Color.GRAY, e.fin());
 		Lines.stroke(2f);
-		Lines.spikes(e.x, e.y, e.fout() * 4f, 2, 6);
+		Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
 		Draw.reset();
 	}),
 	
 	purifystone = new Effect(10, e -> {
-		Draw.color(Color.ORANGE, Color.GRAY, e.fout());
+		Draw.color(Color.ORANGE, Color.GRAY, e.fin());
 		Lines.stroke(2f);
-		Lines.spikes(e.x, e.y, e.fout() * 4f, 2, 6);
+		Lines.spikes(e.x, e.y, e.fin() * 4f, 2, 6);
 		Draw.reset();
 	}),
 	
 	generate = new Effect(11, e -> {
-		Draw.color(Color.ORANGE, Color.YELLOW, e.fout());
+		Draw.color(Color.ORANGE, Color.YELLOW, e.fin());
 		Lines.stroke(1f);
-		Lines.spikes(e.x, e.y, e.fout() * 5f, 2, 8);
+		Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
 		Draw.reset();
 	}),
 
 	spark = new Effect(10, e -> {
 		Lines.stroke(1f);
-		Draw.color(Color.WHITE, Color.GRAY, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 5f, 2, 8);
+		Draw.color(Color.WHITE, Color.GRAY, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 8);
 		Draw.reset();
 	}),
 	
 	sparkbig = new Effect(11, e -> {
 		Lines.stroke(1f);
-		Draw.color(lightRed, Color.GRAY, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 5f, 2.3f, 8);
+		Draw.color(lightRed, Color.GRAY, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 5f, 2.3f, 8);
 		Draw.reset();
 	}),
 	
 	smelt = new Effect(10, e -> {
 		Lines.stroke(1f);
-		Draw.color(Color.YELLOW, Color.RED, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 5f, 1f, 8);
+		Draw.color(Color.YELLOW, Color.RED, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 5f, 1f, 8);
 		Draw.reset();
 	}),
 
 	breakBlock = new Effect(12, e -> {
 		Lines.stroke(2f);
-		Draw.color(Color.WHITE, Colors.get("break"), e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 6f, 2, 5, 90);
+		Draw.color(Color.WHITE, Colors.get("break"), e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 6f, 2, 5, 90);
 		Draw.reset();
 	}),
 
 	hit = new Effect(10, e -> {
 		Lines.stroke(1f);
-		Draw.color(Color.WHITE, Color.ORANGE, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 3f, 2, 8);
+		Draw.color(Color.WHITE, Color.ORANGE, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 3f, 2, 8);
 		Draw.reset();
 	}),
 	
 	laserhit = new Effect(10, e -> {
 		Lines.stroke(1f);
-		Draw.color(Color.WHITE, Color.SKY, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 2f, 2, 6);
+		Draw.color(Color.WHITE, Color.SKY, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 2f, 2, 6);
 		Draw.reset();
 	}),
 	
 	shieldhit = new Effect(9, e -> {
 		Lines.stroke(1f);
-		Draw.color(Color.WHITE, Color.SKY, e.fout());
-		Lines.spikes(e.x, e.y, e.fout() * 5f, 2, 6);
-		Lines.stroke(4f*e.fin());
-		Lines.circle(e.x, e.y, e.fout()*14f);
+		Draw.color(Color.WHITE, Color.SKY, e.fin());
+		Lines.spikes(e.x, e.y, e.fin() * 5f, 2, 6);
+		Lines.stroke(4f*e.fout());
+		Lines.circle(e.x, e.y, e.fin()*14f);
 		Draw.reset();
 	}),
 	
 	laserShoot = new Effect(8, e -> {
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fin(), 6f, 2f, 0.8f);
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fout(), 6f, 2f, 0.8f);
 		Draw.reset();
 	}),
 
 	spreadShoot = new Effect(12, e -> {
-		Draw.color(Color.WHITE, Color.PURPLE, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fin(), 9f, 3.5f, 0.8f);
+		Draw.color(Color.WHITE, Color.PURPLE, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fout(), 9f, 3.5f, 0.8f);
 		Draw.reset();
 	}),
 
 	clusterShoot = new Effect(12, e -> {
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fin(), 10f, 2.5f, 0.7f);
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fout(), 10f, 2.5f, 0.7f);
 		Draw.reset();
 	}),
 	
 	vulcanShoot = new Effect(8, e -> {
-		Draw.color(lighterOrange, lightOrange, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fin(), 10f, 2f, 0.7f);
+		Draw.color(lighterOrange, lightOrange, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fout(), 10f, 2f, 0.7f);
 		Draw.reset();
 	}),
 	
 	shockShoot = new Effect(8, e -> {
-		Draw.color(Color.WHITE, Color.ORANGE, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fin(), 14f, 4f, 0.8f);
+		Draw.color(Color.WHITE, Color.ORANGE, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation, 3, e.fout(), 14f, 4f, 0.8f);
 		Draw.reset();
 	}),
 
 	beamShoot = new Effect(8, e -> {
-		Draw.color(beamLight, beam, e.fout());
-		Shapes.lineShot(e.x, e.y, e.rotation - 70, 3, e.fin(), 12f, 1f, 0.5f);
-		Shapes.lineShot(e.x, e.y, e.rotation + 70, 3, e.fin(), 12f, 1f, 0.5f);
+		Draw.color(beamLight, beam, e.fin());
+		Shapes.lineShot(e.x, e.y, e.rotation - 70, 3, e.fout(), 12f, 1f, 0.5f);
+		Shapes.lineShot(e.x, e.y, e.rotation + 70, 3, e.fout(), 12f, 1f, 0.5f);
 		Draw.reset();
 	}),
 
     beamhit = new Effect(8, e -> {
-        Draw.color(beamLight, beam, e.fout());
-        Lines.stroke(e.fin()*3f+0.5f);
-        Lines.circle(e.x, e.y, e.fout()*8f);
-        Lines.spikes(e.x, e.y, e.fout()*6f, 2f, 4, 45);
+        Draw.color(beamLight, beam, e.fin());
+        Lines.stroke(e.fout()*3f+0.5f);
+        Lines.circle(e.x, e.y, e.fin()*8f);
+        Lines.spikes(e.x, e.y, e.fin()*6f, 2f, 4, 45);
         Draw.reset();
     }),
 
 	titanExplosion = new Effect(11, 48f, e -> {
-		Lines.stroke(2f*e.fin()+0.5f);
+		Lines.stroke(2f*e.fout()+0.5f);
 		Draw.color(Color.WHITE, Color.DARK_GRAY, e.finpow());
 		Lines.circle(e.x, e.y, 5f + e.finpow() * 8f);
 		
-		Draw.color(e.fout() < 0.5f ? whiteOrange : Color.DARK_GRAY);
-		float rad = e.fin()*10f + 5f;
+		Draw.color(e.fin() < 0.5f ? whiteOrange : Color.DARK_GRAY);
+		float rad = e.fout()*10f + 5f;
 		Angles.randLenVectors(e.id, 5, 9f, (x, y)->{
 			Draw.rect("circle2", e.x + x, e.y + y, rad, rad);
 		});
@@ -418,12 +418,12 @@ public class Fx{
 	}),
 
 	explosion = new Effect(11, e -> {
-		Lines.stroke(2f*e.fin()+0.5f);
+		Lines.stroke(2f*e.fout()+0.5f);
 		Draw.color(Color.WHITE, Color.DARK_GRAY, e.finpow());
 		Lines.circle(e.x, e.y, 5f + e.finpow() * 6f);
 		
-		Draw.color(e.fout() < 0.5f ? Color.WHITE : Color.DARK_GRAY);
-		float rad = e.fin()*10f + 5f;
+		Draw.color(e.fin() < 0.5f ? Color.WHITE : Color.DARK_GRAY);
+		float rad = e.fout()*10f + 5f;
 		Angles.randLenVectors(e.id, 5, 8f, (x, y)->{
 			Draw.rect("circle2", e.x + x, e.y + y, rad, rad);
 		});
@@ -433,19 +433,19 @@ public class Fx{
 	
 	
 	blockexplosion = new Effect(13, e -> {
-		Angles.randLenVectors(e.id+1, 8, 5f + e.fout()*11f, (x, y)->{
-			float size = 2f+e.fin()*8f;
-			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fout());
+		Angles.randLenVectors(e.id+1, 8, 5f + e.fin()*11f, (x, y)->{
+			float size = 2f+e.fout()*8f;
+			Draw.color(Color.LIGHT_GRAY, Color.DARK_GRAY, e.fin());
 			Draw.rect("circle", e.x + x, e.y + y, size, size);
 			Draw.reset();
 		});
 		
-		Lines.stroke(2f*e.fin()+0.4f);
+		Lines.stroke(2f*e.fout()+0.4f);
 		Draw.color(Color.WHITE, Color.ORANGE, e.finpow());
 		Lines.circle(e.x, e.y, 2f + e.finpow() * 9f);
 		
-		Draw.color(e.fout() < 0.5f ? Color.WHITE : Color.DARK_GRAY);
-		float rad = e.fin()*10f + 2f;
+		Draw.color(e.fin() < 0.5f ? Color.WHITE : Color.DARK_GRAY);
+		float rad = e.fout()*10f + 2f;
 		Angles.randLenVectors(e.id, 5, 8f, (x, y)->{
 			Draw.rect("circle2", e.x + x, e.y + y, rad, rad);
 		});
@@ -454,53 +454,53 @@ public class Fx{
 	}),
 
 	clusterbomb = new Effect(10f, e -> {
-		Draw.color(Color.WHITE, lightOrange, e.fout());
-		Lines.stroke(e.fin()*1.5f);
-		Lines.poly(e.x, e.y, 4, e.fin()*8f);
-		Lines.circle(e.x, e.y, e.fout()*14f);
+		Draw.color(Color.WHITE, lightOrange, e.fin());
+		Lines.stroke(e.fout()*1.5f);
+		Lines.poly(e.x, e.y, 4, e.fout()*8f);
+		Lines.circle(e.x, e.y, e.fin()*14f);
 		Draw.reset();
 	}),
 	
 	coreexplosion = new Effect(13, e -> {
-		Lines.stroke(3f-e.fout()*2f);
-		Draw.color(Color.ORANGE, Color.WHITE, e.fout());
-		Lines.spikes(e.x, e.y, 5f + e.fout() * 40f, 6, 6);
-		Lines.circle(e.x, e.y, 4f + e.fout() * 40f);
+		Lines.stroke(3f-e.fin()*2f);
+		Draw.color(Color.ORANGE, Color.WHITE, e.fin());
+		Lines.spikes(e.x, e.y, 5f + e.fin() * 40f, 6, 6);
+		Lines.circle(e.x, e.y, 4f + e.fin() * 40f);
 		Draw.reset();
 	}),
 	
 	smoke = new Effect(100, e -> {
-		Draw.color(Color.GRAY, new Color(0.3f, 0.3f, 0.3f, 1f), e.fout());
-		float size = 7f-e.fout()*7f;
+		Draw.color(Color.GRAY, new Color(0.3f, 0.3f, 0.3f, 1f), e.fin());
+		float size = 7f-e.fin()*7f;
 		Draw.rect("circle", e.x, e.y, size, size);
 		Draw.reset();
 	}),
 	
 	railsmoke = new Effect(30, e -> {
-		Draw.color(Color.LIGHT_GRAY, Color.WHITE, e.fout());
-		float size = e.fin()*4f;
+		Draw.color(Color.LIGHT_GRAY, Color.WHITE, e.fin());
+		float size = e.fout()*4f;
 		Draw.rect("circle", e.x, e.y, size, size);
 		Draw.reset();
 	}),
 
 	chainsmoke = new Effect(30, e -> {
 		Draw.color(lightGray);
-		float size = e.fin()*4f;
+		float size = e.fout()*4f;
 		Draw.rect("circle", e.x, e.y, size, size);
 		Draw.reset();
 	}),
 	
 	dashsmoke = new Effect(30, e -> {
-		Draw.color(Color.CORAL, Color.GRAY, e.fout());
-		float size = e.fin()*4f;
+		Draw.color(Color.CORAL, Color.GRAY, e.fin());
+		float size = e.fout()*4f;
 		Draw.rect("circle", e.x, e.y, size, size);
 		Draw.reset();
 	}),
 	
 	spawn = new Effect(23, e -> {
 		Lines.stroke(2f);
-		Draw.color(Color.DARK_GRAY, Color.SCARLET, e.fout());
-		Lines.circle(e.x, e.y, 7f - e.fout() * 6f);
+		Draw.color(Color.DARK_GRAY, Color.SCARLET, e.fin());
+		Lines.circle(e.x, e.y, 7f - e.fin() * 6f);
 		Draw.reset();
 	}),
 	
@@ -512,7 +512,7 @@ public class Fx{
 		Draw.reset();
 	}),
 	transfer = new Effect(20, e -> {
-		Draw.color(Color.SCARLET, Color.CLEAR, e.fin());
+		Draw.color(Color.SCARLET, Color.CLEAR, e.fout());
 		Lines.square(e.x, e.y, 4);
 		Lines.lineAngle(e.x, e.y, e.rotation, 5f);
 		Draw.reset();