diff --git a/data/for testing.txt b/data/for testing.txt
index daa291a..0267d7c 100644
--- a/data/for testing.txt	
+++ b/data/for testing.txt	
@@ -20,11 +20,11 @@ outfitter "Diba"
 outfitter "Cheat"
 	"Jibauni Government License"
 	"Jibauni License"
+	"Jibauni Rebel Fighter License"
 	"Rebel Jibauni License"
 	"Rebel Jibauni Capital License"
 	"Diba License"
 	"Jump Drive"
-	"Hyperdrive"
 
 outfit "Diba License"
 	category "Licenses"
diff --git a/data/jibauni/jibauni outfits.txt b/data/jibauni/jibauni outfits.txt
index a6ad295..c6b4a22 100644
--- a/data/jibauni/jibauni outfits.txt	
+++ b/data/jibauni/jibauni outfits.txt	
@@ -58,15 +58,15 @@ outfit "Eimlaq Engines"
 	"outfit space" -90
 	"engine capacity" -70
 	"thrust" 50
-	"thrusting energy" 10
+	"thrusting energy" 4
 	"thrusting heat" 20
 	"thrusting fuel" .1
 	"reverse thrust" 10
-	"reverse thrusting energy" 2
+	"reverse thrusting energy" .3
 	"reverse thrusting heat" 2
 	"reverse thrusting fuel" .01
 	"turn" 1250
-	"turning energy" 5
+	"turning energy" 2
 	"turning heat" 12
 	"turning fuel" 1.25
 	"slowing resistance" .1
@@ -86,15 +86,15 @@ outfit "Wasita Engines"
 	"outfit space" -50
 	"engine capacity" -30
 	"thrust" 27
-	"thrusting energy" 5
+	"thrusting energy" 1
 	"thrusting heat" 10
 	"thrusting fuel" .65
 	"reverse thrust" 3
-	"reverse thrusting energy" 0.5
+	"reverse thrusting energy" 0.2
 	"reverse thrusting heat" 1
 	"reverse thrusting fuel" .003
 	"turn" 600
-	"turning energy" 1
+	"turning energy" .7
 	"turning heat" 4
 	"turning fuel" .6
 	"slowing resistance" .05
@@ -114,12 +114,10 @@ outfit "Alhaja Engines"
 	"outfit space" -20
 	"engine capacity" -15
 	"thrust" 5
-	"thrusting energy" 1
+	"thrusting energy" .6
 	"thrusting heat" .5
-	"reverse thrust" 1
-	"reverse thrusting energy" .001
-	"turn" 30
-	"turning energy" 1
+	"turn" 90
+	"turning energy" .5
 	"turning heat" .7
 	"slowing resistance" .01
 	"slowing resistance fuel" .01
@@ -559,8 +557,7 @@ outfit "Jahgir Energy Generator"
 	"energy generation" 2
 	"heat generation" 1.5
 	"mass" 15
-	"ramscoop" .15
-	"jibauni generator" -.5
+	"ramscoop" .01
 
 outfit "Watsaq Energy Generator"
 	cost 50000
@@ -571,7 +568,7 @@ outfit "Watsaq Energy Generator"
 	"heat generation" 1.75
 	"mass" 20
 	"fuel generation" .2
-	"ramscoop" .15
+	"ramscoop" .05
 	"jibauni generator" -1
 
 outfit "Tawasitaq Energy Generator"
@@ -581,20 +578,20 @@ outfit "Tawasitaq Energy Generator"
 	"outfit space" -45
 	"energy generation" 5
 	"heat generation" 1.9
-	"mass" 35
-	"fuel generation" .6
-	"ramscoop" .15
+	"mass" 45
+	"fuel generation" .5
+	"ramscoop" .1
 	"jibauni generator" -2
 
 outfit "Daltaq Energy Generator"
 	cost 4000000
 	category "Power"
 	thumbnail "outfit/daltaq generator"
-	"outfit space" -100
-	"energy generation" 13.8
-	"heat generation" 13.3
-	"mass" 90
-	"fuel generation" 2
+	"outfit space" -65
+	"energy generation" 7.35
+	"heat generation" 3.4
+	"mass" 65
+	"fuel generation" .8
 	"ramscoop" .15
 	"jibauni generator" -4
 
diff --git a/data/jibauni/jibauni ships.txt b/data/jibauni/jibauni ships.txt
index 5ca0ad2..d4eb934 100644
--- a/data/jibauni/jibauni ships.txt	
+++ b/data/jibauni/jibauni ships.txt	
@@ -44,7 +44,6 @@ ship "Larajal"
 		"Jibauni Small Laser" 3
 
 		"Jahgir Energy Generator"
-		"Saybatrit Battery"
 		"Minjal"
 		
 		"Alhaja Engines"
@@ -97,7 +96,6 @@ ship "Muraw"
 		"Lilsa Anti-Missile"
 
 		"Watsaq Energy Generator"
-		"Saybatrit Battery"
 		"Minjal"
 		
 		"Alhaja Engines"
@@ -148,7 +146,6 @@ ship "Latbaliday"
 		"Jibauni Small Laser"
 
 		"Jahgir Energy Generator"
-		"Saybatrit Battery"
 		"Minjal"
 
 		"Alhaja Engines"
@@ -281,8 +278,10 @@ ship "Yankul"
 		"engine capacity" 0
 		"jibauni generator" 0.5
 		"fuel protection" .7
-		"thrust" 15
-		"turn" 75
+		"thrust" 22
+		"turn" 110
+		"thrusting fuel" .2
+		"steering fuel" .4
 		"flare sprite" "effect/ion flare/tiny"
 		licenses
 			Jibauni
@@ -336,7 +335,6 @@ ship "Saghir"
 		"Ruksay Missile" 30
 
 		"Watsaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal"
 
@@ -391,7 +389,6 @@ ship "Furus"
 		"Rukjay Missile" 30
 
 		"Watsaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal"
 
@@ -422,7 +419,7 @@ ship "Minaldmasmin"
 		"hull" 1000
 		"required crew" 5
 		"bunks" 10
-		"mass" 340
+		"mass" 530
 		"drag" 6.49
 		"heat dissipation" .4
 		"fuel capacity" 400
@@ -449,8 +446,7 @@ ship "Minaldmasmin"
 		"Lilsa Anti-Missile"
 		"Altaedin Laser"
 
-		"Watsaq Energy Generator"
-		"Saybatrit Battery"
+		"Tawasitaq Energy Generator"
 		"Jamum Shield Generator"
 		"Minjal"
 
@@ -550,7 +546,6 @@ ship "Nakil"
 		"Lilsa Anti-Missile"
 
 		"Tawasitaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal" 5
 
@@ -594,7 +589,7 @@ ship "Quyan"
 		"heat dissipation" .3
 		"fuel capacity" 400
 		"cargo space" 40
-		"outfit space" 180
+		"outfit space" 200
 		"weapon capacity" 18
 		"engine capacity" 70
 		"jibauni generator" 2
@@ -609,8 +604,7 @@ ship "Quyan"
 	outfits
 		"Lilsa Anti-Missile"
 
-		"Watsaq Energy Generator"
-		"Saybatrit Battery"
+		"Tawasitaq Energy Generator"
 		"Jamum Shield Generator"
 		"Minjal" 12
 
@@ -666,7 +660,6 @@ ship "Yiyharsi"
 		"Lilsa Anti-Missile"
 
 		"Tawasitaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal" 6
 
@@ -723,7 +716,6 @@ ship "Nathas"
 		"Lilsa Anti-Missile"
 
 		"Tawasitaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal" 2
 
@@ -778,7 +770,6 @@ ship "Nathaq"
 		"Lilsa Anti-Missile" 2
 
 		"Daltaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Minjal" 9
 
@@ -842,7 +833,6 @@ ship "Nathar"
 		"Lilsa Anti-Missile" 2
 
 		"Daltaq Energy Generator"
-		"Saybatrit Battery"
 		"Jamum Shield Generator"
 		"Tamum Shield Generator"
 		"Minjal" 72
@@ -907,7 +897,6 @@ ship "Safinat"
 		"Zarhal Laser Turret" 5
 
 		"Daltaq Energy Generator" 2
-		"Farbatal Battery"
 		"Tamum Shield Generator" 3
 		"Minjal" 61