diff --git a/map.cpp b/map.cpp
index 3cb23ed..b4c3f30 100755
--- a/map.cpp
+++ b/map.cpp
@@ -383,8 +383,8 @@ namespace battleship{
 
 		vector<int> cellIds;
 
-		for(int i = vertId - numRings; i <= vertId + numRings; i++)
-			for(int j = horId - numRings; j <= horId + numRings; j++)
+		for(int i = max(vertId - numRings, 0); i <= min(vertId + numRings, numVertCells - 1); i++)
+			for(int j = max(horId - numRings, 0); j <= min(horId + numRings, numHorCells - 1); j++)
 				cellIds.push_back(numHorCells * i + j);
 
 		return cellIds;
diff --git a/vehicle.cpp b/vehicle.cpp
index 813b339..adeebf5 100644
--- a/vehicle.cpp
+++ b/vehicle.cpp
@@ -209,14 +209,9 @@ namespace battleship{
 	}
 
 	void Vehicle::moveByPlane(Vector3 hypVec, float destOffset){
-		float hypAngle = hypVec.norm().getAngleBetween(upVec) - PI / 2;
-		float offset = hypVec.getLength() * sin(hypAngle);
+		Vector3 linDest = Vector3(pathPoints[0].x, pos.y, pathPoints[0].z);
 
-		Vector3 linDest = pathPoints[0] + upVec * offset;
-		Vector3 destDir = (linDest - pos).norm();
-		float angle = (destDir != Vector3::VEC_ZERO ? dirVec.getAngleBetween(destDir) : -1);
-
-		if(pos.getDistanceFrom(pathPoints[0]) > destOffset){
+		if(pos.getDistanceFrom(linDest) > destOffset){
 			float dist = pos.getDistanceFrom(linDest);
 			float movementAmmount = (speed > dist ? dist : speed);
 			advance(movementAmmount);
@@ -242,6 +237,8 @@ namespace battleship{
 
 		Vector3 hypVec = (pathPoints[0] - pos);
 		Vector3 baseDir = getVecToPlane(pos, hypVec, upVec);
+		if(baseDir == Vector3::VEC_ZERO) baseDir = dirVec;
+
 		float angle = baseDir.getAngleBetween(dirVec);
 
 		if(angle > anglePrecision && pos.getDistanceFrom(pathPoints[0]) > destOffset)
@@ -255,7 +252,8 @@ namespace battleship{
     void Vehicle::move(Order order) {
 		navigate(0.5 * Map::getSingleton()->getCellSize().x);
 
-		if(pathPoints.empty()) removeOrder(0);
+		if(pathPoints.empty())
+			removeOrder(0);
     }
 
 	void Vehicle::exitGarrisonable(Vector3 exitPos){