diff --git a/README.md b/README.md
index 5a907f2e..629ab04a 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,10 @@ As an example, when you define a varient, say AIRBUS/A320/Varients/A320-111.txt,
 | RANGE      	| Range in nautical miles    					| 3300 |
 | CEILING      	| Operational ceiling in feet    				| 41000 |
 | MAX_SPEED     | Maximum Speed in knots    					| 470 |
-| PAX_CAP     	| The maximum passenger capacity    			| 195 |
+| PAX_CAP     	| The maximum passenger capacity (not including pilot(s))    			| 195 |
 | REMARKS       | Another other pertinent information          | Aerobatics Approved |
 
-# Data usage
+# Data usage and attribution
+Data from Wikipedia is licensed under the [Creative Commons Attribution-ShareAlike 3.0 Unported license](https://creativecommons.org/licenses/by-sa/3.0/)
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/src/PIPER/J3/J3.txt b/src/PIPER/J3/J3.txt
index c8cbd3e1..683991af 100644
--- a/src/PIPER/J3/J3.txt
+++ b/src/PIPER/J3/J3.txt
@@ -1,6 +1,17 @@
-MODEL=Cub (J-3/L-4/NE)
+MODEL=J-3 Cub
 ICAO=J3
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Continental A-40
+ENG_MAN=Continental
+ENG_MODEL=A-40
+ENG_THRUST=40
+LENGTH=6.83
+WINGSPAN=10.74
+TAIL_HEIGHT=2.03
+RANGE=191
+CEILING=11500
+MAX_SPEED=76
+PAX_CAP=1
\ No newline at end of file
diff --git a/src/PIPER/J3/Varients/J3-5.txt b/src/PIPER/J3/Varients/J3-5.txt
deleted file mode 100644
index 80e55a0f..00000000
--- a/src/PIPER/J3/Varients/J3-5.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=J-3 Cub
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/J3/Varients/J3-6.txt b/src/PIPER/J3/Varients/J3-6.txt
deleted file mode 100644
index 57daa883..00000000
--- a/src/PIPER/J3/Varients/J3-6.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=L-4 Cub
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/J3/Varients/J3-7.txt b/src/PIPER/J3/Varients/J3-7.txt
deleted file mode 100644
index 9418a655..00000000
--- a/src/PIPER/J3/Varients/J3-7.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=NE Cub
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/P28A.txt b/src/PIPER/P28A/P28A.txt
index ee60712d..0b1c55db 100644
--- a/src/PIPER/P28A/P28A.txt
+++ b/src/PIPER/P28A/P28A.txt
@@ -1,6 +1,17 @@
-MODEL=Archer 2
+MODEL=PA-28
 ICAO=P28A
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-360-A4A
+ENG_MAN=Lycoming
+ENG_MODEL=O-360-A4A
+ENG_THRUST=180
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-32.txt b/src/PIPER/P28A/Varients/P28A-32.txt
deleted file mode 100644
index 68a31864..00000000
--- a/src/PIPER/P28A/Varients/P28A-32.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Archer 3
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-33.txt b/src/PIPER/P28A/Varients/P28A-33.txt
deleted file mode 100644
index 2414eea8..00000000
--- a/src/PIPER/P28A/Varients/P28A-33.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cadet
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-34.txt b/src/PIPER/P28A/Varients/P28A-34.txt
deleted file mode 100644
index bc1f4cec..00000000
--- a/src/PIPER/P28A/Varients/P28A-34.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee 140-4
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-35.txt b/src/PIPER/P28A/Varients/P28A-35.txt
deleted file mode 100644
index ef00e3fa..00000000
--- a/src/PIPER/P28A/Varients/P28A-35.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee (PA-28-140/150/160/180)
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-36.txt b/src/PIPER/P28A/Varients/P28A-36.txt
deleted file mode 100644
index 6326ae53..00000000
--- a/src/PIPER/P28A/Varients/P28A-36.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Archer
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-37.txt b/src/PIPER/P28A/Varients/P28A-37.txt
deleted file mode 100644
index 0e54199b..00000000
--- a/src/PIPER/P28A/Varients/P28A-37.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Archer 2
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-38.txt b/src/PIPER/P28A/Varients/P28A-38.txt
deleted file mode 100644
index abd557f7..00000000
--- a/src/PIPER/P28A/Varients/P28A-38.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Challenger
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-39.txt b/src/PIPER/P28A/Varients/P28A-39.txt
deleted file mode 100644
index 38582050..00000000
--- a/src/PIPER/P28A/Varients/P28A-39.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Chief
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-40.txt b/src/PIPER/P28A/Varients/P28A-40.txt
deleted file mode 100644
index b4853c4e..00000000
--- a/src/PIPER/P28A/Varients/P28A-40.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Cruiser
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-41.txt b/src/PIPER/P28A/Varients/P28A-41.txt
deleted file mode 100644
index 44bca2b0..00000000
--- a/src/PIPER/P28A/Varients/P28A-41.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Flite Liner
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-42.txt b/src/PIPER/P28A/Varients/P28A-42.txt
deleted file mode 100644
index c367c80a..00000000
--- a/src/PIPER/P28A/Varients/P28A-42.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Warrior
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-43.txt b/src/PIPER/P28A/Varients/P28A-43.txt
deleted file mode 100644
index c9dea235..00000000
--- a/src/PIPER/P28A/Varients/P28A-43.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Warrior 2
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-44.txt b/src/PIPER/P28A/Varients/P28A-44.txt
deleted file mode 100644
index 39625a8f..00000000
--- a/src/PIPER/P28A/Varients/P28A-44.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-28-140 Cherokee
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-62.txt b/src/PIPER/P28A/Varients/P28A-62.txt
deleted file mode 100644
index caaedd5e..00000000
--- a/src/PIPER/P28A/Varients/P28A-62.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Archer TX
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-64.txt b/src/PIPER/P28A/Varients/P28A-64.txt
deleted file mode 100644
index 18bc2fd4..00000000
--- a/src/PIPER/P28A/Varients/P28A-64.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Warrior 2
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-65.txt b/src/PIPER/P28A/Varients/P28A-65.txt
deleted file mode 100644
index 60bdc2d3..00000000
--- a/src/PIPER/P28A/Varients/P28A-65.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Warrior 3
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-66.txt b/src/PIPER/P28A/Varients/P28A-66.txt
deleted file mode 100644
index a489f780..00000000
--- a/src/PIPER/P28A/Varients/P28A-66.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-28-181 Archer LX
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28A/Varients/P28A-67.txt b/src/PIPER/P28A/Varients/P28A-67.txt
deleted file mode 100644
index 8dc32774..00000000
--- a/src/PIPER/P28A/Varients/P28A-67.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Archer LX
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28B/P28B.txt b/src/PIPER/P28B/P28B.txt
index 45c41021..ec3b113b 100644
--- a/src/PIPER/P28B/P28B.txt
+++ b/src/PIPER/P28B/P28B.txt
@@ -1,6 +1,17 @@
-MODEL=Cherokee (PA-28-235)
+MODEL=PA-28B
 ICAO=P28B
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-360-A4A
+ENG_MAN=Lycoming
+ENG_MODEL=O-360-A4A
+ENG_THRUST=180
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/P28B/Varients/P28B-18.txt b/src/PIPER/P28B/Varients/P28B-18.txt
deleted file mode 100644
index a2a8fb11..00000000
--- a/src/PIPER/P28B/Varients/P28B-18.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Charger
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28B/Varients/P28B-19.txt b/src/PIPER/P28B/Varients/P28B-19.txt
deleted file mode 100644
index 4a4775c2..00000000
--- a/src/PIPER/P28B/Varients/P28B-19.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Pathfinder
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28B/Varients/P28B-20.txt b/src/PIPER/P28B/Varients/P28B-20.txt
deleted file mode 100644
index 67bdea81..00000000
--- a/src/PIPER/P28B/Varients/P28B-20.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Dakota
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28B/Varients/P28B-26.txt b/src/PIPER/P28B/Varients/P28B-26.txt
deleted file mode 100644
index bb421507..00000000
--- a/src/PIPER/P28B/Varients/P28B-26.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Turbo Dakota
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28R/P28R.txt b/src/PIPER/P28R/P28R.txt
index 0bbc275b..e8a1e140 100644
--- a/src/PIPER/P28R/P28R.txt
+++ b/src/PIPER/P28R/P28R.txt
@@ -1,6 +1,17 @@
-MODEL=Arrow 3
+MODEL=PA-28R
 ICAO=P28R
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-320-D2A
+ENG_MAN=Lycoming
+ENG_MODEL=O-320-D2A
+ENG_THRUST=160
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/P28R/Varients/P28R-13.txt b/src/PIPER/P28R/Varients/P28R-13.txt
deleted file mode 100644
index b880980c..00000000
--- a/src/PIPER/P28R/Varients/P28R-13.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Arrow
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28R/Varients/P28R-14.txt b/src/PIPER/P28R/Varients/P28R-14.txt
deleted file mode 100644
index 09c6cc73..00000000
--- a/src/PIPER/P28R/Varients/P28R-14.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Arrow 2
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28R/Varients/P28R-15.txt b/src/PIPER/P28R/Varients/P28R-15.txt
deleted file mode 100644
index 5dee5bc9..00000000
--- a/src/PIPER/P28R/Varients/P28R-15.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Cherokee Arrow 3
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28R/Varients/P28R-22.txt b/src/PIPER/P28R/Varients/P28R-22.txt
deleted file mode 100644
index 99768d6c..00000000
--- a/src/PIPER/P28R/Varients/P28R-22.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Arrow
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28S/P28S.txt b/src/PIPER/P28S/P28S.txt
index 07dd29d1..d748b4af 100644
--- a/src/PIPER/P28S/P28S.txt
+++ b/src/PIPER/P28S/P28S.txt
@@ -1,6 +1,17 @@
-MODEL=PA-28R-201T Turbo Cherokee Arrow 3
+MODEL=PA-28S
 ICAO=P28S
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-320-D2A
+ENG_MAN=Lycoming
+ENG_MODEL=O-320-D2A
+ENG_THRUST=160
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/P28S/Varients/P28S-10.txt b/src/PIPER/P28S/Varients/P28S-10.txt
deleted file mode 100644
index 1a4088c9..00000000
--- a/src/PIPER/P28S/Varients/P28S-10.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Turbo Arrow 3
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28S/Varients/P28S-11.txt b/src/PIPER/P28S/Varients/P28S-11.txt
deleted file mode 100644
index 8a40b665..00000000
--- a/src/PIPER/P28S/Varients/P28S-11.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Turbo Arrow
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28S/Varients/P28S-9.txt b/src/PIPER/P28S/Varients/P28S-9.txt
deleted file mode 100644
index e042e7af..00000000
--- a/src/PIPER/P28S/Varients/P28S-9.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Turbo Cherokee Arrow 3
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/P28T/P28T.txt b/src/PIPER/P28T/P28T.txt
index 72a7cd9b..cb343ce8 100644
--- a/src/PIPER/P28T/P28T.txt
+++ b/src/PIPER/P28T/P28T.txt
@@ -1,6 +1,17 @@
-MODEL=Arrow 4
+MODEL=PA-28T
 ICAO=P28T
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-360-A4A
+ENG_MAN=Lycoming
+ENG_MODEL=O-360-A4A
+ENG_THRUST=180
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/P28U/P28U.txt b/src/PIPER/P28U/P28U.txt
index da68d649..dbcecc04 100644
--- a/src/PIPER/P28U/P28U.txt
+++ b/src/PIPER/P28U/P28U.txt
@@ -1,6 +1,17 @@
-MODEL=Turbo Arrow 4
+MODEL=PA-28U
 ICAO=P28U
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-360-A4A
+ENG_MAN=Lycoming
+ENG_MODEL=O-360-A4A
+ENG_THRUST=180
+LENGTH=7.10
+WINGSPAN=9.14
+TAIL_HEIGHT=2.23
+RANGE=465
+CEILING=14300
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/PA11/PA11.txt b/src/PIPER/PA11/PA11.txt
index 20502efd..7c1d8426 100644
--- a/src/PIPER/PA11/PA11.txt
+++ b/src/PIPER/PA11/PA11.txt
@@ -1,6 +1,17 @@
-MODEL=Cub Special
+MODEL=PA-11 Cub Special
 ICAO=PA11
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Continental A65-8
+ENG_MAN=Continental
+ENG_MODEL=A65-8
+ENG_THRUST=65
+LENGTH=6.8
+WINGSPAN=10.7
+TAIL_HEIGHT=2.03
+RANGE=350
+CEILING=16000
+MAX_SPEED=97
+PAX_CAP=1
\ No newline at end of file
diff --git a/src/PIPER/PA11/Varients/PA11-1.txt b/src/PIPER/PA11/Varients/PA11-1.txt
new file mode 100644
index 00000000..81737349
--- /dev/null
+++ b/src/PIPER/PA11/Varients/PA11-1.txt
@@ -0,0 +1,4 @@
+ENG_NAME=Continental C90-8
+ENG_MAN=Continental
+ENG_MODEL=C90-8
+ENG_THRUST=95
\ No newline at end of file
diff --git a/src/PIPER/PA11/Varients/PA11-5.txt b/src/PIPER/PA11/Varients/PA11-5.txt
deleted file mode 100644
index 86277b05..00000000
--- a/src/PIPER/PA11/Varients/PA11-5.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=L-18B Cub Special
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA11/Varients/PA11-6.txt b/src/PIPER/PA11/Varients/PA11-6.txt
deleted file mode 100644
index af32d3f2..00000000
--- a/src/PIPER/PA11/Varients/PA11-6.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-11 Cub Special
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA12/PA12.txt b/src/PIPER/PA12/PA12.txt
index a8fa442b..94224af0 100644
--- a/src/PIPER/PA12/PA12.txt
+++ b/src/PIPER/PA12/PA12.txt
@@ -3,4 +3,15 @@ ICAO=PA12
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-235-C
+ENG_MAN=Lycoming
+ENG_MODEL=O-235-C
+ENG_THRUST=108
+LENGTH=6.96
+WINGSPAN=10.81
+TAIL_HEIGHT=2.08
+RANGE=521
+CEILING=12600
+MAX_SPEED=91
+PAX_CAP=2
\ No newline at end of file
diff --git a/src/PIPER/PA12/Varients/PA12-2.txt b/src/PIPER/PA12/Varients/PA12-2.txt
deleted file mode 100644
index fd7830ff..00000000
--- a/src/PIPER/PA12/Varients/PA12-2.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Super Cruiser
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA18/PA18.txt b/src/PIPER/PA18/PA18.txt
index 5bcdd091..5a8d9623 100644
--- a/src/PIPER/PA18/PA18.txt
+++ b/src/PIPER/PA18/PA18.txt
@@ -1,6 +1,17 @@
-MODEL=L-18C Super Cub
+MODEL=PA-18 Super Cub
 ICAO=PA18
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-320
+ENG_MAN=Lycoming
+ENG_MODEL=O-320
+ENG_THRUST=150
+LENGTH=6.88
+WINGSPAN=10.73
+TAIL_HEIGHT=2.05
+RANGE=460
+CEILING=19000
+MAX_SPEED=110
+PAX_CAP=1
\ No newline at end of file
diff --git a/src/PIPER/PA22/PA22.txt b/src/PIPER/PA22/PA22.txt
index 2c1318d2..7c2a20b3 100644
--- a/src/PIPER/PA22/PA22.txt
+++ b/src/PIPER/PA22/PA22.txt
@@ -1,6 +1,17 @@
-MODEL=Caribbean
+MODEL=PA-22 Tri-Pacer
 ICAO=PA22
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming O-320-B
+ENG_MAN=Lycoming
+ENG_MODEL=O-320-B
+ENG_THRUST=160
+LENGTH=6.25
+WINGSPAN=8.92
+TAIL_HEIGHT=2.54
+RANGE=500
+CEILING=16500
+MAX_SPEED=123
+PAX_CAP=3
\ No newline at end of file
diff --git a/src/PIPER/PA22/Varients/PA22-1.txt b/src/PIPER/PA22/Varients/PA22-1.txt
index 6c97791e..78f2dea9 100644
--- a/src/PIPER/PA22/Varients/PA22-1.txt
+++ b/src/PIPER/PA22/Varients/PA22-1.txt
@@ -1,3 +1,3 @@
-MODEL=Colt
+MODEL=PA-22 Caribbean
 ENG_TYPE=P
 ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA22/Varients/PA22-2.txt b/src/PIPER/PA22/Varients/PA22-2.txt
index 78f2dea9..a2e0cc16 100644
--- a/src/PIPER/PA22/Varients/PA22-2.txt
+++ b/src/PIPER/PA22/Varients/PA22-2.txt
@@ -1,3 +1,3 @@
-MODEL=PA-22 Caribbean
+MODEL=PA-22 Colt
 ENG_TYPE=P
 ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA22/Varients/PA22-3.txt b/src/PIPER/PA22/Varients/PA22-3.txt
deleted file mode 100644
index a2e0cc16..00000000
--- a/src/PIPER/PA22/Varients/PA22-3.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-22 Colt
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA22/Varients/PA22-4.txt b/src/PIPER/PA22/Varients/PA22-4.txt
deleted file mode 100644
index 197aa067..00000000
--- a/src/PIPER/PA22/Varients/PA22-4.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-22 Tri-Pacer
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA22/Varients/PA22-5.txt b/src/PIPER/PA22/Varients/PA22-5.txt
deleted file mode 100644
index 4c493c1f..00000000
--- a/src/PIPER/PA22/Varients/PA22-5.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=Tri-Pacer
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
diff --git a/src/PIPER/PA24/PA24.txt b/src/PIPER/PA24/PA24.txt
index 77942d8f..172979e5 100644
--- a/src/PIPER/PA24/PA24.txt
+++ b/src/PIPER/PA24/PA24.txt
@@ -1,6 +1,17 @@
-MODEL=Comanche
+MODEL=PA-24 Comanche
 ICAO=PA24
 CLASS=L
 WAKE=L
 ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file
+ENG_NUM=1
+ENG_NAME=Lycoming IO-540
+ENG_MAN=Lycoming
+ENG_MODEL=IO-540
+ENG_THRUST=260
+LENGTH=7.62
+WINGSPAN=10.97
+TAIL_HEIGHT=2.29
+RANGE=1225
+CEILING=19500
+MAX_SPEED=169
+PAX_CAP=5
\ No newline at end of file
diff --git a/src/PIPER/PA24/Varients/PA24-1.txt b/src/PIPER/PA24/Varients/PA24-1.txt
deleted file mode 100644
index 02281a89..00000000
--- a/src/PIPER/PA24/Varients/PA24-1.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-MODEL=PA-24 Comanche
-ENG_TYPE=P
-ENG_NUM=1
\ No newline at end of file