Index: src/com/example/helloandroid/Fleet.java
===================================================================
--- src/com/example/helloandroid/Fleet.java	(revision 730d808c9a5ca8927925cf95e954e3b9599aab3a)
+++ src/com/example/helloandroid/Fleet.java	(revision 647a312b41ba04402bf61423d82619e553f06e5b)
@@ -21,11 +21,7 @@
 	private boolean isNextToAPlanet;
 	private boolean isClockwise;
-	
-	private boolean done;	
 
 	/* Optimising: pre-calculate paths */
 	public Fleet(Planet source, Planet destination, int numShips, int faction) {
-		done = false;
-		
 		source.setNumShips(source.getNumShips()-numShips);
 		
@@ -213,18 +209,11 @@
 				} 
 				
-				//double radAngle = Math.atan(getSlope(destination.getX(), destination.getY(), dblX, dblY));
-				//figure out which way to go clockwise or counter clockwise 
-				tangentAngle = (Math.atan(getSlope(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY))) + (Math.PI/2);
-				angle = Math.atan((Math.tan(tangentAngle) - Math.tan(direction))/(1 + Math.tan(tangentAngle)*Math.tan(direction)));
-				
-				Log.d("Galcon", "tangentAngle: "+tangentAngle);
-				Log.d("Galcon", "direction: "+direction+",  angle: "+angle);
-				
-				if (angle <= Math.PI/2)
-					angle = Math.PI - angle;
-				
-				//double diff = direction-angle;
-				
-				//if(diff > 0)
+				tangentAngle = Math.atan(getSlope(nearPlanet.getX(),nearPlanet.getY(),dblX,dblY));
+				
+				if(dblX < nearPlanet.getX())
+					tangentAngle += Math.PI;
+				
+				tangentAngle += Math.PI/2;
+				
 				if(Math.abs(tangentAngle-direction) > Math.PI/2) {
 					isClockwise = false;
@@ -240,10 +229,4 @@
 				
 				isNextToAPlanet = true;
-				//figure out which way to go clockwise or counter clockwise 
-				/*tangentDirection = (Math.atan(getSlope(temp.getX(),temp.getY(),dblX,dblY))) + (Math.PI/2);
-				angle = Math.atan((Math.tan(tangentDirection) - Math.tan(direction))/(1 + Math.tan(tangentDirection)*Math.tan(direction)));
-				if (angle <= Math.PI/2)
-					angle = Math.PI - angle;*/
-				//get next point and the direction and set it
 			}
 		} else {
@@ -253,6 +236,5 @@
 			
 			double dist = Math.abs(destination.getY() - (Math.tan(direction)*destination.getX()) - xIntercept)/(double)Math.sqrt(Math.pow(direction,2)+1);
-			//Log.d("Galcon", "dist: "+dist);
-			if(dist < 5 && dist == 1){
+			if(dist < 2){
 				dblY += (Math.sin(direction)*speed);
 				dblX += (Math.cos(direction)*speed);
@@ -267,9 +249,4 @@
 			} else {
 				angle = speed/(double)nearPlanet.radius*.1;
-				
-				if(!done) {
-					Log.d("Galcon", "direction: "+direction+", angle: "+angle);
-					Log.d("Galcon", "original: ("+dblX+", "+dblY+")");
-				}
 				
 				if(isClockwise){
@@ -282,9 +259,4 @@
 					direction = direction - angle;
 				}
-				
-				if(!done)
-					Log.d("Galcon", "new: ("+dblX+", "+dblY+")");
-				
-				done = true;
 				
 				x = (int)dblX;