diff --git a/resources/units/aircraft/vwv_a1_skyraider.yaml b/resources/units/aircraft/vwv_a1_skyraider.yaml
index ea53fe0d..91237dbf 100644
--- a/resources/units/aircraft/vwv_a1_skyraider.yaml
+++ b/resources/units/aircraft/vwv_a1_skyraider.yaml
@@ -11,23 +11,30 @@ description:    # from: https://en.wikipedia.org/wiki/Douglas_A-1_Skyraider
   the Jet Age (when most piston-engine attack or fighter aircraft were replaced by 
   jet aircraft); thus becoming known by some as an "anachronism". The aircraft was 
   nicknamed "Spad", after the French World War I fighter.
-introduced: 1946
+introduced: 1946      # original type 1946, A-1H before 1964, USA retired 1973
 manufacturer: Douglas
 origin: USA
 price: 5    # reference: Skyhawk = 7, Bronco = 4
 role: Carrier-based Attack Aircraft
-gunfighter: true   # TODO  what is this?
+gunfighter: true
 # TODO maxrange?
 variants:
   A-1H Skyraider: {}
 tasks:
-  Anti-ship: 660
-  BAI: 660    # TODO  how to determine these numbers?
-  CAS: 660
-  DEAD: 60
-  OCA/Aircraft: 360   # TODO is this parked a/c?
-  OCA/Runway: 360
-  Strike: 360
+  Anti-ship: 200
+  BAI: 300
+  CAS: 300
+  SEAD: 100
+  SEAD Sweep: 100
+  DEAD: 100
+  OCA/Aircraft: 200
+  OCA/Runway: 200
+  Strike: 300
+  Escort: 0
+  Fighter sweep: 0
+  Intercept: 0
+  TARCAP: 0
+  BARCAP: 0
 weapon_injections:     # TODO  update
   1:
     - "{AIM-9J-ON-ADAPTER}"
diff --git a/resources/units/aircraft/vwv_crusader.yaml b/resources/units/aircraft/vwv_crusader.yaml
index 5d1db6f2..a36d9c9e 100644
--- a/resources/units/aircraft/vwv_crusader.yaml
+++ b/resources/units/aircraft/vwv_crusader.yaml
@@ -1,7 +1,3 @@
-# TODO set prince
-# TODO define task numbers
-# TODO define weapon injections
-#
 carrier_capable: true
 description:    # from: https://en.wikipedia.org/wiki/Vought_F-8_Crusader
   The Vought F-8 Crusader (originally F8U) is a single-engine, supersonic, 
@@ -18,42 +14,26 @@ description:    # from: https://en.wikipedia.org/wiki/Vought_F-8_Crusader
   to pilot. American F-8s saw active combat during the Vietnam War, engaging in multiple 
   dogfights with MiG-17s of the Vietnam People's Air Force as well as performing ground 
   attack missions in the theatre.
-introduced: 1957
+introduced: 1963     # original type 1957, F-8E before 1964, USA retired 1976
 manufacturer: Vought
 origin: USA
 price: 9    # reference: Starfighter = 9, Thunderchief = 9
 role: Carrier-based Interceptor
 gunfighter: true
-# TODO maxrange?
 variants:
   F-8E Crusader: {}
-#
-#    tasks = [
-#        task.CAP,
-#        task.Escort,
-#        task.FighterSweep,
-#        task.Intercept,
-#        task.Reconnaissance,
-#        task.GroundAttack,
-#        task.CAS,
-#        task.AntishipStrike,
-#    ]
-#    task_default = task.CAP
-#
 tasks:
-  Anti-ship: 660
-  BAI: 660    # TODO  how to determine these numbers?
-  CAS: 660
-  DEAD: 60
-  OCA/Aircraft: 360   # TODO is this parked a/c?
-  OCA/Runway: 360
-  Strike: 360
-weapon_injections:     # TODO  update
-  1:
-    - "{AIM-9J-ON-ADAPTER}"
-  2:
-    - "{AIM-9J-ON-ADAPTER}"
-  4:
-    - "{AIM-9J-ON-ADAPTER}"
-  5:
-    - "{AIM-9J-ON-ADAPTER}"
+  Anti-ship: 100
+  BAI: 100
+  CAS: 100
+  SEAD: 0
+  SEAD Sweep: 0
+  DEAD: 0
+  OCA/Aircraft: 0
+  OCA/Runway: 0
+  Strike: 100
+  Escort: 300
+  Fighter sweep: 300
+  Intercept: 400
+  TARCAP: 300
+  BARCAP: 300
diff --git a/resources/units/aircraft/vwv_crusader_np.yaml b/resources/units/aircraft/vwv_crusader_np.yaml
deleted file mode 100644
index 00a9e53d..00000000
--- a/resources/units/aircraft/vwv_crusader_np.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# TODO set prince
-# TODO define task numbers
-# TODO define weapon injections
-#
-carrier_capable: true
-description:    # from: https://en.wikipedia.org/wiki/Vought_F-8_Crusader
-  The Vought F-8 Crusader (originally F8U) is a single-engine, supersonic, 
-  carrier-based air superiority jet aircraft designed and produced by the American 
-  aircraft manufacturer Vought. It was the last American fighter that had guns as 
-  the primary weapon, earning it the title "The Last of the Gunfighters". 
-  On 21 August 1956, U.S. Navy pilot R.W. Windsor attained a top speed of 1,015 mph; 
-  in doing so, the F-8 became the first jet fighter in American service to reach 
-  1,000 mph.
-  During March 1957, the F-8 was introduced into regular operations with the US Navy. 
-  In addition to the Navy, the type was also operated by the United States Marine Corps 
-  (replacing the Vought F7U Cutlass), the French Navy, and the Philippine Air Force. 
-  Early on, the type experienced an above-average mishap rate, being somewhat difficult 
-  to pilot. American F-8s saw active combat during the Vietnam War, engaging in multiple 
-  dogfights with MiG-17s of the Vietnam People's Air Force as well as performing ground 
-  attack missions in the theatre.
-  The F-8E(FN) is operated by the French Navy.
-introduced: 1957
-manufacturer: Vought
-origin: USA  # TODO is this nation of manufacturer or operator?
-price: 9    # reference: Starfighter = 9, Thunderchief = 9
-role: Carrier-based Interceptor
-gunfighter: true
-# TODO maxrange?
-variants:
-  F-8E(FN) Crusader: {}
-#
-#    tasks = [
-#        task.CAP,
-#        task.Escort,
-#        task.FighterSweep,
-#        task.Intercept,
-#        task.Reconnaissance,
-#    ]
-#    task_default = task.CAP
-#
-tasks:
-  Anti-ship: 660
-  BAI: 660    # TODO  how to determine these numbers?
-  CAS: 660
-  DEAD: 60
-  OCA/Aircraft: 360   # TODO is this parked a/c?
-  OCA/Runway: 360
-  Strike: 360
-weapon_injections:     # TODO  update
-  1:
-    - "{AIM-9J-ON-ADAPTER}"
-  2:
-    - "{AIM-9J-ON-ADAPTER}"
-  4:
-    - "{AIM-9J-ON-ADAPTER}"
-  5:
-    - "{AIM-9J-ON-ADAPTER}"
diff --git a/resources/units/aircraft/vwv_hh2d.yaml b/resources/units/aircraft/vwv_hh2d.yaml
index d0696fe7..4cbd803d 100644
--- a/resources/units/aircraft/vwv_hh2d.yaml
+++ b/resources/units/aircraft/vwv_hh2d.yaml
@@ -17,7 +17,7 @@ description:  # from: https://en.wikipedia.org/wiki/Kaman_SH-2_Seasprite
   situational awareness of ships. The SH-2D first flew on 16 March 1971.
   HH-2D was a search and rescue version.
 lha_capable: true
-introduced: 1962   # TODO original model or D-model?
+introduced: 1971   # original type 1962, SH-2D 1971
 cabin_size: 12  # from: https://plane-encyclopedia.com/cold-war/kaman-sh-2f-seasprite/
 can_carry_crates: true
 manufacturer: Kaman Aircraft Corporation
@@ -33,10 +33,6 @@ radios:   #TODO radios??
     type: common
     intra_flight_radio_index: 1
     inter_flight_radio_index: 1
-#
-#      tasks = [task.Escort, task.GroundAttack, task.CAS, task.AFAC, task.AntishipStrike]
-#    task_default = task.AntishipStrike
-#
 tasks:
-  Air Assault: 120
-  Transport: 110
+  Air Assault: 0
+  Transport: 100
diff --git a/resources/units/aircraft/vwv_mig17f.yaml b/resources/units/aircraft/vwv_mig17f.yaml
index 9741bc82..f465102d 100644
--- a/resources/units/aircraft/vwv_mig17f.yaml
+++ b/resources/units/aircraft/vwv_mig17f.yaml
@@ -1,7 +1,3 @@
-# TODO set prince
-# TODO define task numbers
-# TODO define weapon injections
-#
 carrier_capable: false
 description:   # from: https://en.wikipedia.org/wiki/Mikoyan-Gurevich_MiG-17
   The Mikoyan-Gurevich MiG-17 (NATO reporting name Fresco) is a high-subsonic fighter 
@@ -19,43 +15,26 @@ description:   # from: https://en.wikipedia.org/wiki/Mikoyan-Gurevich_MiG-17
   the American F-4 Phantom and F-105 Thunderchief, which were focused on speed and 
   long range combat, as well as the fact that MiG-17 was armed with guns, which 
   initial models of the F-4 Phantom lacked.
-introduced: 1952
+introduced: 1953     # original type 1952, MiG-17F 1953, USSR retired ?
 manufacturer: Mikoyan-Gurevich
 origin: Soviet Union
 price: 9    # reference: MiG-15bis = 8, MiG-19P = 10
 role: Interceptor
-gunfighter: true   # TODO  what is this?
-# TODO maxrange?
+gunfighter: true
 variants:
   MiG-17F Fresco C: {}
-#
-#    tasks = [
-#        task.CAP,
-#        task.Escort,
-#        task.FighterSweep,
-#        task.Intercept,
-#        task.Reconnaissance,
-#        task.GroundAttack,
-#        task.CAS,
-#        task.AFAC,
-#        task.RunwayAttack,
-#    ]
-#    task_default = task.CAP
-#
 tasks:
-  Anti-ship: 660
-  BAI: 660    # TODO  how to determine these numbers?
-  CAS: 660
-  DEAD: 60
-  OCA/Aircraft: 360   # TODO is this parked a/c?
-  OCA/Runway: 360
-  Strike: 360
-weapon_injections:     # TODO  update
-  1:
-    - "{AIM-9J-ON-ADAPTER}"
-  2:
-    - "{AIM-9J-ON-ADAPTER}"
-  4:
-    - "{AIM-9J-ON-ADAPTER}"
-  5:
-    - "{AIM-9J-ON-ADAPTER}"
+  Anti-ship: 0
+  BAI: 100
+  CAS: 100
+  SEAD: 0
+  SEAD Sweep: 0
+  DEAD: 0
+  OCA/Aircraft: 100
+  OCA/Runway: 100
+  Strike: 100
+  Escort: 300
+  Fighter sweep: 300
+  Intercept: 300
+  TARCAP: 300
+  BARCAP: 300
\ No newline at end of file
diff --git a/resources/units/aircraft/vwv_o-1.yaml b/resources/units/aircraft/vwv_o-1.yaml
index 5dfab474..6fd31a74 100644
--- a/resources/units/aircraft/vwv_o-1.yaml
+++ b/resources/units/aircraft/vwv_o-1.yaml
@@ -1,7 +1,3 @@
-# TODO set prince
-# TODO define task numbers
-# TODO define weapon injections
-#
 carrier_capable: false
 description:    # from: https://en.wikipedia.org/wiki/Cessna_O-1_Bird_Dog
   The Cessna O-1 Bird Dog is a liaison and observation aircraft that first flew on 
@@ -20,35 +16,20 @@ origin: USA
 price: 2    # reference: Bronco = 4
 role: observation aircraft
 gunfighter: false
-# TODO maxrange?
 variants:
   O-1E Bird Dog: {}
-#
-#    tasks = [
-#        task.CAP,
-#        task.Escort,
-#        task.FighterSweep,
-#        task.Intercept,
-#        task.Reconnaissance,
-#        task.GroundAttack,
-#        task.CAS,
-#    ]
-#    task_default = task.CAP
-#
 tasks:
-  Anti-ship: 660
-  BAI: 660    # TODO  how to determine these numbers?
-  CAS: 660
-  DEAD: 60
-  OCA/Aircraft: 360   # TODO is this parked a/c?
-  OCA/Runway: 360
-  Strike: 360
-weapon_injections:     # TODO  update
-  1:
-    - "{AIM-9J-ON-ADAPTER}"
-  2:
-    - "{AIM-9J-ON-ADAPTER}"
-  4:
-    - "{AIM-9J-ON-ADAPTER}"
-  5:
-    - "{AIM-9J-ON-ADAPTER}"
+  Anti-ship: 0
+  BAI: 100
+  CAS: 100
+  SEAD: 0
+  SEAD Sweep: 0
+  DEAD: 0
+  OCA/Aircraft: 0
+  OCA/Runway: 0
+  Strike: 100
+  Escort: 0
+  Fighter sweep: 0
+  Intercept: 0
+  TARCAP: 0
+  BARCAP: 0
\ No newline at end of file
diff --git a/resources/units/aircraft/vwv_ra-5.yaml b/resources/units/aircraft/vwv_ra-5.yaml
new file mode 100644
index 00000000..d9b55baf
--- /dev/null
+++ b/resources/units/aircraft/vwv_ra-5.yaml
@@ -0,0 +1,47 @@
+carrier_capable: true
+description:    # from: https://en.wikipedia.org/wiki/North_American_A-5_Vigilante
+  The North American A-5 Vigilante is an American carrier-based supersonic bomber 
+  designed and built by North American Aviation (NAA) for the United States Navy.
+  Development of the A-5 had started in 1954 as a private venture by NAA, who sought 
+  to produce a capable supersonic long-distance bomber as a successor to the abortive 
+  North American XA2J Super Savage. It was a large and complex aircraft that 
+  incorporated several innovative features, such as being the first bomber to feature 
+  a digital computer, while its ability to attain speeds of up to Mach 2 while 
+  carrying a nuclear strike payload was also relatively ambitious for the era. 
+  The US Navy saw the value of such a bomber, leading to a contract for its full 
+  development and production being issued to the firm on 29 August 1956. The type 
+  performed its first flight just over two years later, on 31 August 1958. 
+  The Vigilante was introduced by the US Navy during June 1961; it succeeded the 
+  Douglas A-3 Skywarrior as the Navy's primary nuclear strike aircraft, but its 
+  service in this capacity was relatively brief due to the deemphasising of manned 
+  bombers in American nuclear strategy. A far larger quantity of the RA-5C tactical 
+  strike reconnaissance variant were also procured by the service, which saw 
+  extensive service during the Vietnam War. It also established several world records 
+  in both long-distance speed and altitude categories. During the mid-1970s, the 
+  withdrawal of the type commenced after a relatively short service life, largely due 
+  to the aircraft being expensive and complex to operate, as well being a victim of 
+  post-Vietnam military cutbacks.
+introduced: 1963      # original type 1961, RA-5C 1963, USA retired 1979
+manufacturer: North American Aviation
+origin: USA
+price: 15    # reference: 
+role: Carrier-based Reconnaissance and Tactical Strike
+gunfighter: false
+variants:
+  RA-5C Vigilante: {}
+tasks:
+  # Reconnaissance
+  Anti-ship: 0
+  BAI: 0
+  CAS: 0
+  SEAD: 0
+  SEAD Sweep: 0
+  DEAD: 0
+  OCA/Aircraft: 0
+  OCA/Runway: 0
+  Strike: 0
+  Escort: 0
+  Fighter sweep: 0
+  Intercept: 0
+  TARCAP: 0
+  BARCAP: 0
diff --git a/resources/units/aircraft/vwv_sh2f.yaml b/resources/units/aircraft/vwv_sh2f.yaml
index e69cbc6f..22916392 100644
--- a/resources/units/aircraft/vwv_sh2f.yaml
+++ b/resources/units/aircraft/vwv_sh2f.yaml
@@ -16,7 +16,7 @@ description:  # from https://en.wikipedia.org/wiki/Kaman_SH-2_Seasprite
   Sea Hawk which entered service starting in the mid-1980s, but it could not 
   operate safety from the smaller flight decks like the smaller Seasprite.
 lha_capable: true
-introduced: 1962   # TODO original model or F-model?
+introduced: 1973   # original type 1962, SH-2F 1973
 cabin_size: 12  # from: https://plane-encyclopedia.com/cold-war/kaman-sh-2f-seasprite/
 can_carry_crates: true
 manufacturer: Kaman Aircraft Corporation
@@ -32,20 +32,20 @@ radios:   #TODO radios??
     type: common
     intra_flight_radio_index: 1
     inter_flight_radio_index: 1
-#
-#    tasks = [
-#        task.CAP,
-#        task.Escort,
-#        task.Intercept,
-#        task.FighterSweep,
-#        task.GroundAttack,
-#        task.CAS,
-#        task.AFAC,
-#        task.RunwayAttack,
-#        task.AntishipStrike,
-#    ]
-#    task_default = task.AntishipStrike
-#
 tasks:
-  Air Assault: 120
-  Transport: 110
+  Anti-ship: 300
+  BAI: 0
+  CAS: 100
+  SEAD: 0
+  SEAD Sweep: 0
+  DEAD: 0
+  OCA/Aircraft: 0
+  OCA/Runway: 100
+  Strike: 100
+  Escort: 0
+  Fighter sweep: 0
+  Intercept: 0
+  TARCAP: 0
+  BARCAP: 0
+  Air Assault: 100
+  Transport: 100