diff --git a/src/ei/game/scene/Map.java b/src/ei/game/scene/Map.java
index cb58436..77e69bc 100644
--- a/src/ei/game/scene/Map.java
+++ b/src/ei/game/scene/Map.java
@@ -8,7 +8,6 @@ import java.util.LinkedList;
 import ei.engine.math.Vector2f;
 import ei.engine.math.Vector2i;
 import ei.engine.math.Vector3f;
-import ei.engine.scene.Box;
 import ei.engine.scene.Entity;
 import ei.engine.scene.Node;
 import ei.engine.scene.Sprite;
diff --git a/src/ei/game/scene/buildings/Building.java b/src/ei/game/scene/buildings/Building.java
index 49b96f9..53662c2 100644
--- a/src/ei/game/scene/buildings/Building.java
+++ b/src/ei/game/scene/buildings/Building.java
@@ -151,19 +151,19 @@ public abstract class Building extends GameEntity{
 			}
 			buildTime++;
 			if(buildTime >= buildQueue.peek().getBuildTime()){
-				if(!unitNode.contains(buildQueue.peekFirst().getNode())){
-					System.out.println(buildQueue.peekFirst().getNode());
-					unitNode.add(buildQueue.peekFirst().getNode(),unitNode.size()/2);
+				if(!unitNode.contains(buildQueue.peek().getNode())){
+					System.out.println(buildQueue.peek().getNode());
+					unitNode.add(buildQueue.peek().getNode(),unitNode.size()/2);
 					buildQueue.peek().getNode().setLocation(moveFrom);
 				}
 				Vector2i temp = Map.getPosByPixel(moveTo.getX(), moveTo.getY());
 				if(InGameState.getMap().isPosEmpty(temp.getX(),temp.getY())){
 					//The moving is done here.
 					if(moveTo.getX() > buildQueue.peek().getNode().getLocation().getX()) {
-						buildQueue.peek().getNode().getLocation().add(buildQueue.peekFirst().getVelocity(), 0f, 0f);
+						buildQueue.peek().getNode().getLocation().add(buildQueue.peek().getVelocity(), 0f, 0f);
 					}
 					if(moveTo.getX() < buildQueue.peek().getNode().getLocation().getX()) {
-						buildQueue.peek().getNode().getLocation().add(-buildQueue.peekFirst().getVelocity(), 0f, 0f);
+						buildQueue.peek().getNode().getLocation().add(-buildQueue.peek().getVelocity(), 0f, 0f);
 					}
 					if(moveTo.getY() > buildQueue.peek().getNode().getLocation().getY()) {
 						buildQueue.peek().getNode().getLocation().add(0f, buildQueue.peek().getVelocity(), 0f);