diff --git a/ts/frames.ts b/ts/frames.ts
index 2da665c..5badf1a 100644
--- a/ts/frames.ts
+++ b/ts/frames.ts
@@ -5,10 +5,12 @@ export const frameTypes = [
     '622D',
     'boxcar',
     'caboose',
-    'class70',
-    'class70_tender',
     'Class125',
     'Class125_Tender',
+    'Class47',
+    'Class47_Tender',
+    'class70',
+    'class70_tender',
     'climax',
     'coach_dsprr_1',
     'cooke260',
@@ -149,7 +151,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             headlightType: 2,
             paintType: 2,
@@ -193,7 +195,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 50,
             boilerPressure: 120,
             boilerWaterLevel: 500,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 171,
             brakeValue: 1,
             headlightType: 1,
             markerLightsCenterState: 3,
@@ -207,10 +209,10 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
         },
     },
 
-    'class70': {
+    'Class125': {
         engine: true,
-        name: 'D&RG Class 70',
-        length: 892,
+        length: 1097,
+        name: 'D&RGW Class 125',
         min: {
             headlightType: 1,
             paintType: 1,
@@ -219,28 +221,28 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
         },
         max: {
             boilerFireTemp: 400,
-            boilerFuelAmount: 100,
-            boilerPressure: 130,
-            boilerWaterLevel: 6000,
-            boilerWaterTemp: 110,
+            boilerFuelAmount: 70,
+            boilerPressure: 160,
+            boilerWaterLevel: 5000,
+            boilerWaterTemp: 181,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
-            markerLightsFrontLeftState: 3,
-            markerLightsFrontRightState: 3,
-            paintType: 3,
+            generatorValveValue: 1,
+            headlightType: 10,
+            paintType: 5,
             regulatorValue: 1,
             reverserValue: 1,
-            headlightType: 3,
             sanderAmount: 100,
-            smokestackType: 3,
+            smokestackType: 7,
         },
     },
 
-    'class70_tender': {
-        length: 654,
-        name: 'Class 70 Tender',
+    'Class125_Tender': {
+        coal: true,
         tender: true,
+        length: 720,
+        name: 'D&RGW Class 125 Tender',
         min: {
             headlightType: 1,
             paintType: 1,
@@ -248,20 +250,19 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
         },
         max: {
             brakeValue: 1,
-            headlightType: 1,
-            markerLightsRearLeftState: 3,
-            markerLightsRearRightState: 3,
-            paintType: 3,
+            headlightType: 10,
+            paintType: 5,
             smokestackType: 1,
-            tenderFuelAmount: 1350,
+            tenderFuelAmount: 7000,
             tenderWaterAmount: 9500,
         },
     },
 
-    'Class125': {
+    'Class47': {
+        coal: true,
         engine: true,
-        length: 1040,
-        name: 'D&RGW Class 125',
+        length: 932,
+        name: 'D&RG Class 47',
         min: {
             headlightType: 1,
             paintType: 1,
@@ -270,39 +271,88 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
         },
         max: {
             boilerFireTemp: 400,
-            boilerFuelAmount: 70,
-            boilerPressure: 160,
-            boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerFuelAmount: 65,
+            boilerPressure: 130,
+            boilerWaterLevel: 2000,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
-            generatorValveValue: 1,
-            headlightType: 10,
-            paintType: 5,
+            headlightType: 8,
+            paintType: 4,
             regulatorValue: 1,
             reverserValue: 1,
             sanderAmount: 100,
-            smokestackType: 7,
+            smokestackType: 8,
         },
     },
 
-    'Class125_Tender': {
+    'Class47_Tender': {
         coal: true,
+        length: 672,
+        name: 'D&RG Class 47 Tender',
         tender: true,
-        length: 650,
-        name: 'D&RGW Class 125 Tender',
         min: {
             headlightType: 1,
-            paintType: 5,
+            paintType: 1,
             smokestackType: 1,
         },
         max: {
             brakeValue: 1,
+            headlightType: 8,
+            paintType: 4,
+            smokestackType: 1,
+            tenderFuelAmount: 5000,
+        },
+    },
+
+    'class70': {
+        engine: true,
+        name: 'D&RG Class 70',
+        length: 892,
+        min: {
             headlightType: 1,
+            paintType: 1,
+            reverserValue: -1,
+            smokestackType: 1,
+        },
+        max: {
+            boilerFireTemp: 400,
+            boilerFuelAmount: 100,
+            boilerPressure: 130,
+            boilerWaterLevel: 6000,
+            boilerWaterTemp: 170,
+            brakeValue: 1,
+            compressorAirPressure: 100,
+            compressorValveValue: 1,
+            markerLightsFrontLeftState: 3,
+            markerLightsFrontRightState: 3,
             paintType: 3,
+            regulatorValue: 1,
+            reverserValue: 1,
+            headlightType: 3,
+            sanderAmount: 100,
+            smokestackType: 3,
+        },
+    },
+
+    'class70_tender': {
+        length: 654,
+        name: 'Class 70 Tender',
+        tender: true,
+        min: {
+            headlightType: 1,
+            paintType: 1,
             smokestackType: 1,
-            tenderFuelAmount: 7000,
+        },
+        max: {
+            brakeValue: 1,
+            headlightType: 1,
+            markerLightsRearLeftState: 3,
+            markerLightsRearRightState: 3,
+            paintType: 3,
+            smokestackType: 1,
+            tenderFuelAmount: 1350,
             tenderWaterAmount: 9500,
         },
     },
@@ -322,7 +372,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 80,
             boilerPressure: 160,
             boilerWaterLevel: 4000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 181,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -376,7 +426,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 80,
             boilerPressure: 150,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 182,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -405,7 +455,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 80,
             boilerPressure: 150,
             boilerWaterLevel: 4500,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 182,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -477,7 +527,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -561,7 +611,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -611,7 +661,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 150,
             boilerWaterLevel: 4400,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 182,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -725,7 +775,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -796,7 +846,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 80,
             boilerPressure: 160,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 181,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -829,8 +879,9 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
     },
 
     'lima280': {
+        coal: true,
         engine: true,
-        length: 1080,
+        length: 950,
         name: 'Lima 2-8-0',
         min: {
             headlightType: 1,
@@ -843,7 +894,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 200,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 189,
             brakeValue: 1,
             headlightType: 8,
             paintType: 2,
@@ -855,6 +906,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
     },
 
     'lima280_tender': {
+        coal: true,
         length: 620,
         name: 'Lima 2-8-0 Tender',
         tender: true,
@@ -888,7 +940,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             headlightType: 2,
             paintType: 2,
@@ -933,7 +985,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             headlightType: 3,
             paintType: 1,
@@ -1167,7 +1219,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 50,
             boilerPressure: 120,
             boilerWaterLevel: 500,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 171,
             brakeValue: 1,
             headlightType: 2,
             paintType: 1,
@@ -1193,7 +1245,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 50,
             boilerPressure: 120,
             boilerWaterLevel: 500,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 171,
             brakeValue: 1,
             headlightType: 2,
             paintType: 1,
@@ -1222,7 +1274,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 150,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 182,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -1251,7 +1303,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 80,
             boilerPressure: 160,
             boilerWaterLevel: 4000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 181,
             brakeValue: 1,
             headlightType: 3,
             paintType: 3,
@@ -1347,7 +1399,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 130,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 170,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -1362,8 +1414,9 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
     },
 
     'tweetsie280': {
+        coal: true,
         engine: true,
-        length: 924,
+        length: 914,
         name: 'ET&WNC 2-8-0',
         min: {
             headlightType: 1,
@@ -1376,7 +1429,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 70,
             boilerPressure: 160,
             boilerWaterLevel: 5000,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 181,
             brakeValue: 1,
             compressorAirPressure: 100,
             compressorValveValue: 1,
@@ -1393,7 +1446,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
     'tweetsie280_tender': {
         coal: true,
         tender: true,
-        length: 679,
+        length: 669,
         name: 'ET&WNC 2-8-0 Tender',
         min: {
             headlightType: 1,
@@ -1458,7 +1511,7 @@ export const frameDefinitions: Record<FrameType, FrameDefinition> = {
             boilerFuelAmount: 50,
             boilerPressure: 120,
             boilerWaterLevel: 500,
-            boilerWaterTemp: 110,
+            boilerWaterTemp: 171,
             brakeValue: 1,
             headlightType: 1,
             markerLightsFrontLeftState: 3,