diff --git a/dat/fleet.xml b/dat/fleet.xml
index 756a9ce..342588e 100644
--- a/dat/fleet.xml
+++ b/dat/fleet.xml
@@ -28,7 +28,7 @@
     <ai>pirate</ai>
     <faction>Pirate</faction>
     <pilots>
-      <pilot chance='100'>Merchant Ship</pilot>
+      <pilot chance='100'>Leapard</pilot>
     </pilots>
   </fleet>
 </Fleets>
diff --git a/dat/ship.xml b/dat/ship.xml
index e238189..bbda53d 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -5,12 +5,12 @@
     <GUI>minimal</GUI>
 		<class>1</class>
 		<movement>
-			<thrust>400</thrust>
-			<turn>180</turn>
+			<thrust>320</thrust>
+			<turn>150</turn>
 			<speed>360</speed>
 		</movement>
 		<health>
-			<shield>50</shield>
+			<shield>70</shield>
 			<armor>80</armor>
 			<energy>240</energy>
 			<shield_regen>80</shield_regen>
@@ -21,11 +21,38 @@
 			<crew>2</crew>
 			<mass>7</mass>
 			<cap_weapon>20</cap_weapon>
-			<cap_cargo>20</cap_cargo>
+			<cap_cargo>25</cap_cargo>
 		</characteristics>
 		<outfits>
-			<outfit quantity='2'>laser</outfit>
+			<outfit quantity='1'>laser</outfit>
 		</outfits>
+  </ship>
+  <ship name = "Leapard">
+    <GFX>leapard</GFX>
+    <GUI>minimal</GUI>
+    <class>1</class>
+    <movement>
+      <thrust>400</thrust>
+      <turn>180</turn>
+      <speed>380</speed>
+    </movement>
+    <health>
+      <shield>50</shield>
+      <armor>60</armor>
+      <energy>180</energy>
+      <shield_regen>100</shield_regen>
+      <armor_regen>60</armor_regen>
+      <energy_regen>40</energy_regen>
+    </health>
+    <characteristics>
+      <crew>2</crew>
+      <mass>5</mass>
+      <cap_weapon>25</cap_weapon>
+      <cap_cargo>10</cap_cargo>
+    </characteristics>
+    <outfits>
+      <outfit quantity ='2'>laser</outfit>
+    </outfits>
   </ship>
 	<ship name="Enemy Test">
 		<GFX>ship1</GFX>
diff --git a/gfx/ship/leapard.png b/gfx/ship/leapard.png
new file mode 100644
index 0000000..e8ce4ca
Binary files /dev/null and b/gfx/ship/leapard.png differ
diff --git a/gfx/ship/leapard_target.png b/gfx/ship/leapard_target.png
new file mode 100644
index 0000000..d3ef325
Binary files /dev/null and b/gfx/ship/leapard_target.png differ
diff --git a/gfx/ship/ship1_target.xcf b/gfx/ship/ship1_target.xcf
deleted file mode 100644
index 892ccd3..0000000
Binary files a/gfx/ship/ship1_target.xcf and /dev/null differ
diff --git a/gfx/ship/ship_target.xcf b/gfx/ship/ship_target.xcf
deleted file mode 100644
index 6082179..0000000
Binary files a/gfx/ship/ship_target.xcf and /dev/null differ
diff --git a/src/joystick.c b/src/joystick.c
index 96e9293..47d74ff 100644
--- a/src/joystick.c
+++ b/src/joystick.c
@@ -50,7 +50,7 @@ int joystick_init(void) {
 
   // Figure out how many joysticks there are.
   numjoysticks = SDL_NumJoysticks();
-  LOG("%d joysticks detected", numjoysticks);
+  LOG("%d joystick%s detected", numjoysticks, (numjoysticks==1)?"":"s");
   for(i = 0; i < numjoysticks; i++)
     LOG("\t\t%d. %s", i, SDL_JoystickName(i));