diff --git a/Assets/GWConquest/Resources/Database/Units.csv b/Assets/GWConquest/Resources/Database/Units.csv
index fba80d0..aefef6d 100644
--- a/Assets/GWConquest/Resources/Database/Units.csv
+++ b/Assets/GWConquest/Resources/Database/Units.csv
@@ -1,70 +1,68 @@
 Full Name,Short Name,Factory Type,Hitpoints,Attack Count,Damage,Penetration,Accuracy,Armour,Shields,Shield Regenerate,Evasion,Movement,Size,Morale,Defence Bonus,Abilities,Credit Cost,Recruit Cost,Ammo Cost,Fuel Cost,Build Time,Credit Upkeep,Food Upkeep,Description
-Anti Tank Gun,AntiTankGun,Armour,30,1,18,5,0.8,1,0,,,,6,,,,,,,,,,,
-Artillery Gun,ArtilleryGun,Armour,24,1,22,1,0.5,1,0,,,0.5,6,,,,,,,,,,,
-Artillery Tank,ArtilleryTank,Armour,60,1,22,1,0.5,1,0,,,,10,,,,,,,,,,,
-Flak Cannon,FlakCannon,Armour,20,6,5,0.5,0.7,1,0,,,0.5,7,,,,,,,,,,,
-Flak Truck,FlakTruck,Armour,20,5,,,0.6,0.5,0,,,4,8,,,,,,,,,,,
-Tekki Truck,TekkiTruck,City,20,1,6,2,0.4,0.5,0,,,,8,,,,,,,,,,,
-Anti Tank Truck,AntiTankTruck,Armour,20,1,8,3,0.7,0.5,0,,,,8,,,,,,,,,,,
-Flak Halftrack,FlakHalftrack,Armour,20,5,,,0.65,1,0,,,3,8,,,,,,,,,,,
-Heavy Anti Tank Gun,HeavyAntiTankGun,Armour,40,1,25,6,0.8,1,0,,,,6,,,,,,,,,,,
-Heavy Artillery Gun,HeavyArtilleryGun,Armour,35,1,30,1.5,0.4,1,0,,,0.3,6,,,,,,,,,,,
-Heavy Rocket Artillery,HeavyRocketArtillery,Armour,35,,,,0.2,1,0,,,,7,,,,,,,,,,,
-Heavy Tank,HeavyTank,Armour,140,1/4,15/4,4/2,0.6/0.6,4,0,,,2,14,,,,1600,,,,1,,,
-Light Anti Tank Gun,LightAntiTankGun,Armour,20,2,8,3,0.7,1,0,,,0.5,6,,,,,,,,,,,
-Light Artillery Gun,LightArtilleryGun,Armour,20,,,,0.4,1,0,,,0.5,6,,,,,,,,,,,
-Light Tank,LightTank,Armour,60,3/5,5/4,2/1,0.6/0.6,2,0,,,3,10,,,,1000,,,,1,,,
-Medium Tank,MediumTank,Armour,100,2/5,10/4,3/1,0.6/0.6,3,0,,,3,12,,,,1200,,,,1,,,
-Rocket Artillery,RocketArtillery,Armour,10,,,,0.2,0,0,,,,7,,,,,,,,,,,
-Scout Vehicle,ScoutVehicle,Armour,40,4,4,1,0.7,1,0,,1,4,6,,,,,,,,,,,
-Super Heavy Artillery Gun,SuperHeavyArtilleryGun,Armour,40,1,50,2,0.3,2,0,,,0.2,6,,,,,,,,,,,
+Anti Tank Gun,AntiTankGun,Armour,30,1,18,5,0.8,1,0,,0,0.5,6,,,,,,,,1,,,
+Artillery Gun,ArtilleryGun,Armour,24,1,22,1,0.4,1,0,,0,0.5,6,,,,,,,,1,,,
+Artillery Tank,ArtilleryTank,Armour,60,1,22,1,0.5,1,0,,0,3,10,,,,,,,,1,,,
+Flak Cannon,FlakCannon,Armour,20,6,5,0.5,0.7,1,0,,0,0.5,7,,,,,,,,1,,,
+Flak Truck,FlakTruck,Armour,20,5,3,2,0.6,0.5,0,,0,4,8,,,,,,,,1,,,
+Tekki Truck,TekkiTruck,City,20,1,6,2,0.4,0.5,0,,0,4,8,,,,,,,,1,,,
+Anti Tank Truck,AntiTankTruck,Armour,20,1,8,3,0.7,0.5,0,,0,4,8,,,,,,,,1,,,
+Flak Halftrack,FlakHalftrack,Armour,20,5,5,0.5,0.65,1,0,,0,3,8,,,,,,,,1,,,
+Heavy Anti Tank Gun,HeavyAntiTankGun,Armour,40,1,25,6,0.8,1,0,,0,0.3,6,,,,,,,,1,,,
+Heavy Artillery Gun,HeavyArtilleryGun,Armour,35,1,30,1.5,0.4,1,0,,0,0.3,6,,,,,,,,1,,,
+Heavy Rocket Artillery,HeavyRocketArtillery,Armour,35,3,20,1.5,0.18,1,0,,0,0.3,7,,,,,,,,1,,,
+Heavy Tank,HeavyTank,Armour,140,1/4,15/4,4/2,0.6/0.6,4,0,,0,2.5,14,,,,1600,,,,1,,,
+Light Anti Tank Gun,LightAntiTankGun,Armour,20,2,8,3,0.7,1,0,,0,0.5,6,,,,,,,,1,,,
+Light Artillery Gun,LightArtilleryGun,Armour,20,2,12,1,0.45,1,0,,0,0.5,6,,,,,,,,1,,,
+Light Tank,LightTank,Armour,60,3/5,5/4,2/1,0.6/0.6,2,0,,0,3,10,,,,1000,,,,1,,,
+Medium Tank,MediumTank,Armour,100,2/5,10/4,3/1,0.6/0.6,3,0,,0,3,12,,,,1200,,,,1,,,
+Rocket Artillery,RocketArtillery,Armour,10,3,14,1,0.2,0,0,,0,0.5,7,,,,,,,,1,,,
+Scout Vehicle,ScoutVehicle,Armour,40,4,4,1,0.7,1,0,,0.3,5,6,,,,,,,,1,,,
+Super Heavy Artillery Gun,SuperHeavyArtilleryGun,Armour,40,1,50,2,0.3,2,0,,0,0.2,6,,,,,,,,1,,,
 Super Heavy Tank,SuperHeavyTank,Armour,180,1/3,20/4,5/2,0.6/0.6,5,0,,0,2,16,,,,2400,,,,1,,,
-Support Vehicle,SupportVehicle,Armour,20,,,,,1,0,,,,8,,,,,,,,,,,
-Tankhunter,Tankhunter,Armour,100,1/2,16/4,4/2,0.7/0.7,2,0,,,2,14,,,,1200,,,,1,,,
-Transport Truck,TransportTruck,Armour,20,,,,,1,0,,,,8,,,,,,,,,,,
-Conscripts,Conscripts,City,10,1,3,0,0.4,0,0,,,,4,4,1,,300,5,2,,30,,,"These soldiers were pressed into service by the military authorities and armed only with subpar equipment. Consequently, their morale is quite low and they should not be expected to fight very hard."
-Militia,Militia,City,10,1,3,0,0.4,0,0,,,2,4,3,1,,100,5,0,,20,,,"Ordinary citizens defending their homeland, armed with everything that could be scrounged from storage. They are only rudimentarily trained and will not pose a  real threat to any sizable force."
-Breacher Squad,BreacherSquad,Infantry,35,2,,,0.5,0.5,0,,,,,,,,,,,,,,,
-Commando Unit,CommandoUnit,Infantry,35,1/1,8/4,0.3,0.7,0.3,0,,1,,,,,stealth II,,,,,,,,
-Demolition Squad,DemolitionSquad,Infantry,15,1,4,0,0.5,0.3,0,,,,,,,,,,,,,,,
-Grav-Chute Squad,GravChuteSquad,Infantry,15,1,4,0,0.5,0,0,,,,,,,,,,,,,,,
-Heavy Infantry,HeavyInfantry,Infantry,35,2,2,,0.5,0.5,0,,,,,5,1,,,,,,,,,
-Heavy Mountain Brigade,HeavyMountainBrigade,Infantry,35,2,2,,0.4,0.3,0,,,,,,,,,,,,,,,
-Light Infantry,LightInfantry,Infantry,15,1,4,0,0.5,0,0,,,,,5,1,,,,,,,,,
-Marine Squad,MarineSquad,Infantry,20,1,4,0,0.5,0,0,,,,,,, stationson,,,,,,,,
-Mechanized Infantry,MechanizedInfantry,Infantry,30,2,,,0.5,1,0,,,,,5,1,,,,,,,,,
-Motorized Infantry,MotorizedInfantry,Infantry,30,2,,,0.5,1,0,,,,,5,1,,,,,,,,,
-Mountain Brigade,MountainBrigade,Infantry,,2,,,0.4,0,0,,,,,,,,,,,,,,,
-Pioneer Squad,PioneerSquad,Infantry,35,1,,,0.5,0.5,0,,,,,6,2,,,,,,,,,
-Sniper Squad,SniperSquad,Infantry,15,,5,0.5,0.9,0,0,,1,,,,,stealth I,,,,,,,,
-Standard Infantry,StandardInfantry,Infantry,20,1,4,0,0.5,0.3,0,,,,,5,1,,,,,,,,,
-Tank Hunter Squad,TankHunterSquad,Infantry,20,1/2,10/2,0,0.4/0.6,0.3,0,,,,,,,,,,,,,,,
-Laser Supressor Tank,LaserSupressorTank,Armour,60,6,4,2,0.4,2,0,,,,,,,,,,,,,,,
-Command Tank,CommandTank,Armour,,,,,,,,,,,,,,,,,,,,,,
-Heavy Command Tank,HeavyCommandTank,Armour,,,,,,,,,,,,,,,,,,,,,,
-Mortar Truck,MortarTruck,Armour,,,,,,,,,,,,,,,,,,,,,,
-Medic Truck,MedicTruck,Armour,,,,,,,,,,,,,,,,,,,,,,
-Old Transport Tank,OldTransportTank,Armour,,,,,,,,,,,,,,,,,,,,,,
-Old Tank,OldTank1,Armour,,,,,,,,,,,,,,,,,,,,,,
-Old Tank,OldTank2,Armour,,,,,,,,,,,,,,,,,,,,,,
-Old Tank,OldTank3,Armour,,,,,,,,,,,,,,,,,,,,,,
-Heavy Scout Vehicle,HeavyScoutVehicle,Armour,,,,,,,,,,,,,,,,,,,,,,
-Transport Vehicle,TransportVehicle,Armour,,,,,,,,,,,,,,,,,,,,,,
-Light Transport Vehicle,LightTransportVehicle,Armour,,,,,,,,,,,,,,,,,,,,,,
-Old Transport Vehicle,OldTransportVehicle,Armour,,,,,,,,,,,,,,,,,,,,,,
-Medic Squad,MedicSquad,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Tank Crew,TankCrew,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Fast Attack Vehicle,FastAttackVehicle,Armour,,,,,,,,,,,,,,,,,,,,,,
-Spy,Spy,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Hazard Squad,HazardSquad,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Heavy Hazard Squad,HeavyHazardSquad,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Gravchute Squad,GravchuteSquad,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Mortar Squad,MortarSquad,Infantry,,,,,,,,,,,,,,,,,,,,,,
-Heavy Flak Cannon,HeavyFlakCannon,Armour,,,,,,,,,,,,,,,,,,,,,,
-,,,,,,,,,,,,,,,,,,,,,,,,
-Rokurant,,Armour,,,,,,,,,,,,,,,,,,,,,,
+Support Vehicle,SupportVehicle,Armour,20,1,1,2,0.7,0.5,0,,0,4,8,,,,,,,,1,,,
+Tankhunter,Tankhunter,Armour,100,1,1,2,0.7,0.5,0,,0,2,12,,,,1200,,,,1,,,
+Transport Truck,TransportTruck,Armour,20,0,0,0,0,1,0,,0,4,8,,,,,,,,1,,,
+Conscripts,Conscripts,City,10,1,3,0,0.4,0,0,,0,1,4,4,1,,300,5,2,,30,,,"These soldiers were pressed into service by the military authorities and armed only with subpar equipment. Consequently, their morale is quite low and they should not be expected to fight very hard."
+Militia,Militia,City,10,1,3,0,0.4,0,0,,0,1,4,3,1,,100,5,0,,20,,,"Ordinary citizens defending their homeland, armed with everything that could be scrounged from storage. They are only rudimentarily trained and will not pose a  real threat to any sizable force."
+Breacher Squad,BreacherSquad,Infantry,35,2,4,0.3,0.5,0.5,0,,0,0.8,5,,,,,,,,1,,,
+Commando Unit,CommandoUnit,Infantry,35,1/1,8/4,1/0.3,0.7/0.7,0.3,0,,0.5,2,3,,,stealth II,,,,,1,,,
+Demolition Squad,DemolitionSquad,Infantry,15,1,4,0,0.5,0.3,0,,0,1,5,,,,,,,,1,,,
+Grav-Chute Squad,GravChuteSquad,Infantry,15,1,4,0,0.5,0,0,,0.2,2,4,,,,,,,,1,,,
+Heavy Infantry,HeavyInfantry,Infantry,35,2,2,0,0.5,0.5,0,,0,0.8,5,5,1,,,,,,1,,,
+Heavy Mountain Brigade,HeavyMountainBrigade,Infantry,35,2,2,0,0.4,0.3,0,,0,0.8,5,,,,,,,,1,,,
+Light Infantry,LightInfantry,Infantry,15,1,4,0,0.5,0,0,,0,1.2,4,5,1,,,,,,1,,,
+Marine Squad,MarineSquad,Infantry,20,1,4,0,0.5,0,0,,0,1,4,,, stationson,,,,,1,,,
+Mountain Brigade,MountainBrigade,Infantry,35,2,2,0,0.4,0,0,,0,1,4,,,,,,,,1,,,
+Pioneer Squad,PioneerSquad,Infantry,35,1,2,0,0.5,0.5,0,,0,1.2,4,6,2,,,,,,1,,,
+Sniper Squad,SniperSquad,Infantry,15,1,5,0.5,0.9,0,0,,0.2,1.2,3,,,stealth I,,,,,1,,,
+Standard Infantry,StandardInfantry,Infantry,20,1,4,0,0.5,0.3,0,,0,1,4,5,1,,,,,,1,,,
+Tank Hunter Squad,TankHunterSquad,Infantry,20,1/2,10/2,3/0,0.4/0.6,0.3,0,,0,0.8,4,,,,,,,,1,,,
+Laser Supressor Tank,LaserSupressorTank,Armour,60,6,4,2,0.4,2,0,,0,3,12,,,,,,,,1,,,
+Command Tank,CommandTank,Armour,90,4,4,0.3,0.5,3,0,,0,3,13,,,,,,,,1,,,
+Heavy Command Tank,HeavyCommandTank,Armour,140,4,4,0.3,0.5,4,0,,0,2,15,,,,,,,,1,,,
+Mortar Truck,MortarTruck,Armour,20,2,5,1,0.3,0.5,0,,0,4,6,,,,,,,,1,,,
+Medic Truck,MedicTruck,Armour,20,0,0,0,0,0.5,0,,0,4,6,,,,,,,,1,,,
+Old Transport Tank,OldTransportTank,Armour,75,2,3,0.3,0.6,2.5,0,,0,3,7,,,,,,,,1,,,
+Old Tank,OldTank1,Armour,70,2/5,9/4,2.5/0.5,0.5/0.6,3,0,,0,2,7,,,,,,,,1,,,
+Old Tank,OldTank2,Armour,75,2/5,10/4,3/0.5,0.6/0.6,3,0,,0,2,7,,,,,,,,1,,,
+Old Tank,OldTank3,Armour,80,2/4,11/4,3/0.5,0.7/0.6,3,0,,0,2,7,,,,,,,,1,,,
+Heavy Scout Vehicle,HeavyScoutVehicle,Armour,45,4,5,1,0.65,1.5,0,,0.25,4.5,6,,,,,,,,1,,,
+Transport Vehicle,TransportVehicle,Armour,45,0,0,0,0,0.5,0,,0,4,8,,,,,,,,1,,,
+Light Transport Vehicle,LightTransportVehicle,Armour,40,0,0,0,0,0.45,0,,0,4.5,6,,,,,,,,1,,,
+Old Transport Vehicle,OldTransportVehicle,Armour,35,0,0,0,0,0.4,0,,0,3.5,6,,,,,,,,1,,,
+Medic Squad,MedicSquad,Infantry,10,1,1,0,0.5,0,0,,0,1,3,,,,,,,,1,,,
+Tank Crew,TankCrew,Infantry,10,1,1,0,0.5,0,0,,0,1,2,,,,,,,,1,,,
+Fast Attack Vehicle,FastAttackVehicle,Armour,25,3,5,1.5,0.55,1.45,0,,0.2,4.5,5,,,,,,,,1,,,
+Spy,Spy,Infantry,5,0,0,0,0,0,0,,0,1,1,,,,,,,,1,,,
+Hazard Squad,HazardSquad,Infantry,25,1,4,0,0.5,0.3,0,,0,0.8,4,,,,,,,,1,,,
+Heavy Hazard Squad,HeavyHazardSquad,Infantry,35,2,2,0,0.5,0.5,0,,0,0.6,5,,,,,,,,1,,,
+Mortar Squad,MortarSquad,Infantry,30,2,7,0.5,0.35,1,0,,0,0.8,4,,,,,,,,1,,,
+Heavy Flak Cannon,HeavyFlakCannon,Armour,40,5,6,1,0.7,1,0,,0,0.3,9,,,,,,,,1,,,
+Light Carrier,Light Carrier,Armour,15,0,0,0,0,0.3,0,,,,,,,,,,,,,,,
+,,,,,,,,,,,,,,,,,,,,,,,,
+Rokurant,,,,,,,,,,,,,,,,,,,,,,,,
 Heavy Artillery Tank,RokurantHAT,Armour,,,,,,3,,,,,,,,,,,,,,,,
-Siegebreaker Tank,,Armour,,,,,,3,,,,,,,,,,,,,,,,
+Siegebreaker Tank,SiegebreakerTank,Armour,,,,,,3,,,,,,,,,,,,,,,,
 Bulk Transporter,RokurantTransporter,Armour,,,,,,3,,,,,,,,,,,,,,,,
 Heavy Rocket Vehicle,RokurantRocketVehicle,Armour,,,,,,3,,,,,,,,,,,,,,,,
 Infantry,RokurantInfantry,Infantry,,,,,,,,,,,,,,,,,,,,,,