diff --git a/src/data/sounds/test.ogg b/src/data/sounds/test.ogg
deleted file mode 100644
index e297a0f..0000000
Binary files a/src/data/sounds/test.ogg and /dev/null differ
diff --git a/src/ei/game/gamestate/InGameState.java b/src/ei/game/gamestate/InGameState.java
index a2ad35a..f9f2c36 100644
--- a/src/ei/game/gamestate/InGameState.java
+++ b/src/ei/game/gamestate/InGameState.java
@@ -30,13 +30,13 @@ public class InGameState extends GameState{
 		
 		HumanPlayer player = new HumanPlayer();
 		Tank t1 = new Tank(player);
-		t1.setLife(10);
 		player.addUnit(t1);
 		Tank t2 = new Tank(1,0, player);
-		t2.setLife(30);
 		player.addUnit(t2);
 		player.addUnit(new Tank(2,0, player));
 		player.addUnit(new Bomber(3, 0, player));
+		player.addUnit(new Bomber(6, 0, player));
+		player.addUnit(new Bomber(7, 0, player));
 		player.addUnit(new APU(4, 0, player));
 		player.addUnit(new APU(5, 0, player));
 		player.addUnit(new CommandCenter(10, 10, player));
diff --git a/src/ei/game/scene/buildings/Building.java b/src/ei/game/scene/buildings/Building.java
index be4ea6c..539490a 100644
--- a/src/ei/game/scene/buildings/Building.java
+++ b/src/ei/game/scene/buildings/Building.java
@@ -84,13 +84,13 @@ public abstract class Building extends GameEntity{
 
 		
 	/**
-	 * Removes this unit from the game.
+	 * Removes this building from the game.
 	 *
 	 */	
-	public void removeUnit(){
+	public void removeBuilding(){
 		unitNode.remove(getSprite());
 		getPlayer().removeUnit(this);
-		InGameState.getMap().removePos(oldPos.getX(), oldPos.getY());
+		InGameState.getMap().removeBuildPos(oldPos.getX(), oldPos.getY(), this.size);
 	}
 	
 	/**
@@ -99,7 +99,7 @@ public abstract class Building extends GameEntity{
 	public void update() {
 		
 		if(getLife()<=0) {
-			removeUnit();
+			removeBuilding();
 		}
 		
 	}
diff --git a/src/ei/game/scene/map/MapEntity.java b/src/ei/game/scene/map/MapEntity.java
index 78e36ca..4b94487 100644
--- a/src/ei/game/scene/map/MapEntity.java
+++ b/src/ei/game/scene/map/MapEntity.java
@@ -19,6 +19,8 @@ public abstract class MapEntity extends Unit{
 			removeUnit();
 		}
 	}
+	public void move(int x, int y){
+	}
 	
 	protected void move(int x, int y, boolean b) {}
 	
diff --git a/src/ei/game/scene/units/APU.java b/src/ei/game/scene/units/APU.java
index 7ff1eeb..4e00828 100644
--- a/src/ei/game/scene/units/APU.java
+++ b/src/ei/game/scene/units/APU.java
@@ -14,7 +14,7 @@ public class APU extends Unit{
 	private Sprite sprite;
 	
 	private Sound gunSound;
-	private Sound moveSound;
+	private Sound moveSound[] = new Sound[2];
 	private Sound attackSound;
 	private Sound selectSound;
 	
@@ -28,12 +28,12 @@ public class APU extends Unit{
 		sprite.setSize(new Vector2f(40,40));
 		getNode().add(sprite);
 		gunSound = new Sound("gunSound", "data/sounds/machinegun.wav");
-		moveSound = new Sound("moveSound", "data/sounds/APUmove1.wav");
+		moveSound[0] = new Sound("moveSound", "data/sounds/APUmove1.wav");
+		moveSound[1] = new Sound("moveSound", "data/sounds/APUmove2.wav");
 		selectSound = new Sound("selectSound", "data/sounds/APUselect.wav");
 		attackSound = new Sound("attackSound", "data/sounds/APUattack.wav");
 
 		selectionBox = new SelectBox(40,40,getMaxLife());
-		setLife(50);
 	}
 
 	protected SelectBox getSelection() {	
@@ -56,7 +56,7 @@ public class APU extends Unit{
 		return gunSound;
 	}
 	public Sound getMoveSound() {
-		return moveSound;
+		return moveSound[(int)(Math.random()*2)];
 	}
 	public Sound getSelectSound() {
 		return selectSound;
diff --git a/src/ei/game/scene/units/Bomber.java b/src/ei/game/scene/units/Bomber.java
index 9c9836f..0f027f3 100644
--- a/src/ei/game/scene/units/Bomber.java
+++ b/src/ei/game/scene/units/Bomber.java
@@ -34,7 +34,6 @@ public class Bomber extends Unit{
 		attackSound = new Sound("attackSound", "data/sounds/BOMBERattack.wav");
 
 		selectionBox = new SelectBox(40,40,getMaxLife());
-		setLife(180);
 	}
 
 	protected SelectBox getSelection() {	
@@ -70,7 +69,7 @@ public class Bomber extends Unit{
 	 * @return
 	 */
 	public float getVelocity() {
-		return 3;
+		return 2;
 	}
 	/**
 	 * Manages the sprite connected to this unit.
diff --git a/src/ei/game/scene/units/Tank.java b/src/ei/game/scene/units/Tank.java
index 1631e73..a15f715 100644
--- a/src/ei/game/scene/units/Tank.java
+++ b/src/ei/game/scene/units/Tank.java
@@ -35,7 +35,6 @@ public class Tank extends Unit{
 		attackSound = new Sound("attackSound", "data/sounds/TANKattack.wav");
 
 		selectionBox = new SelectBox(40,40,getMaxLife());
-		setLife(50);
 	}
 
 	protected SelectBox getSelection() {	
diff --git a/src/ei/game/scene/units/Unit.java b/src/ei/game/scene/units/Unit.java
index 17605a3..24113ca 100644
--- a/src/ei/game/scene/units/Unit.java
+++ b/src/ei/game/scene/units/Unit.java
@@ -157,7 +157,7 @@ public abstract class Unit extends GameEntity{
 	 * Updating the unit
 	 */
 	public void update() {
-		
+		weponTimer++;
 		if(getLife()<=0) {
 			removeUnit();
 		}
@@ -271,9 +271,7 @@ public abstract class Unit extends GameEntity{
 						WeaponHandler.getInstance().addWeapon(wepon);
 						weponTimer = 0;
 					}
-					else{
-						weponTimer++;
-					}
+					
 				}
 				else{
 					move(enamyPos.getX(),enamyPos.getY(), false);
diff --git a/src/ei/game/scene/weapons/BomberWeapon.java b/src/ei/game/scene/weapons/BomberWeapon.java
index aa925a2..7177d2e 100644
--- a/src/ei/game/scene/weapons/BomberWeapon.java
+++ b/src/ei/game/scene/weapons/BomberWeapon.java
@@ -15,7 +15,7 @@ public class BomberWeapon extends Weapon{
 		super(startPos);
 		setVelocity(4);
 		setRange(100);
-		setDamage(30);
+		setDamage(40);
 		setReload(150);
 		hit = false;
 		position = Map.getPosByPixel(startPos.getX(), startPos.getY());