diff --git a/dat/outfit.xml b/dat/outfit.xml
index 51d7318..f0b53c1 100644
--- a/dat/outfit.xml
+++ b/dat/outfit.xml
@@ -155,15 +155,15 @@
       <mass>2</mass>
    <price>22500</price>
    <description>A heavy battery that will increase your ships energy allowing you to pack more firepower.</description>
-   <gfx_store>capacitator</gfx_store>
+   <gfx_store>capacitor</gfx_store>
   </general>
     <specific type="15">
-   <energy>75</energy>
+   <energy>30</energy>
     </specific>
  </outfit>
  <outfit name="Solar Panel">
   <general>
-   <max>3</max>
+   <max>5</max>
    <tech>5</tech>
       <mass>3</mass>
    <price>55000</price>
@@ -184,7 +184,7 @@
    <gfx_store>capacitator</gfx_store>
   </general>
   <specific type="15">
-   <shield>30</shield>
+   <shield>15</shield>
     </specific>
  </outfit>
  <outfit name="Shield Booster">
@@ -198,7 +198,7 @@
   </general>
   <specific type="15">
    <shield>15</shield>
-   <shield_regen>10</shield_regen>
+   <shield_regen>15</shield_regen>
    <energy_regen>-50</energy_regen>
     </specific>
  </outfit>
@@ -212,7 +212,7 @@
    <gfx_store>reroute</gfx_store>
   </general>
   <specific type="15">
-   <thrust>60</thrust>
+   <thrust>70</thrust>
    <energy_regen>-50</energy_regen>
     </specific>
  </outfit>
diff --git a/dat/ship.xml b/dat/ship.xml
index 6720ccd..e1f404c 100644
--- a/dat/ship.xml
+++ b/dat/ship.xml
@@ -15,8 +15,8 @@
    <speed>360</speed>
   </movement>
   <health>
-   <shield>90</shield>
-   <armour>120</armour>
+   <shield>50</shield>
+   <armour>60</armour>
    <energy>240</energy>
    <shield_regen>80</shield_regen>
    <armour_regen>50</armour_regen>
@@ -47,8 +47,8 @@
       <speed>480</speed>
     </movement>
     <health>
-      <shield>140</shield>
-      <armour>100</armour>
+      <shield>70</shield>
+      <armour>50</armour>
       <energy>180</energy>
       <shield_regen>150</shield_regen>
       <armour_regen>60</armour_regen>
@@ -79,8 +79,8 @@
    <speed>260</speed>
   </movement>
   <health>
-   <shield>1040</shield>
-   <armour>720</armour>
+   <shield>600</shield>
+   <armour>400</armour>
    <energy>900</energy>
    <shield_regen>300</shield_regen>
    <armour_regen>80</armour_regen>
@@ -113,8 +113,8 @@
    <speed>320</speed>
   </movement>
   <health>
-   <shield>320</shield>
-   <armour>220</armour>
+   <shield>200</shield>
+   <armour>140</armour>
    <energy>360</energy>
    <shield_regen>180</shield_regen>
    <armour_regen>60</armour_regen>
@@ -147,9 +147,9 @@
    <speed>260</speed>
   </movement>
   <health>
-   <shield>200</shield>
-   <armour>340</armour>
-   <energy>200</energy>
+   <shield>160</shield>
+   <armour>200</armour>
+   <energy>300</energy>
    <shield_regen>100</shield_regen>
    <armour_regen>40</armour_regen>
    <energy_regen>800</energy_regen>