diff --git a/Utilities/Matlab/FDS_validation_dataplot_inputs.csv b/Utilities/Matlab/FDS_validation_dataplot_inputs.csv
index 17a5a584e68..8c217b1d540 100644
--- a/Utilities/Matlab/FDS_validation_dataplot_inputs.csv
+++ b/Utilities/Matlab/FDS_validation_dataplot_inputs.csv
@@ -2195,18 +2195,18 @@ d,Vettori Sprinkler,Vettori_Sloped_Ceiling/Vettori_Sloped_Ceiling_Act.csv,1,2,Ac
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 s,Extinction,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_2H_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_2H_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_2H_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,TeX
-d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_8}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_8}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_8}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,TeX
-d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_6}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_6}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {C_3H_6}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,TeX
-d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {CH_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {CH_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,TeX
-f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, {CH_4}",O_2 Volume Fraction,\eta,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,TeX
+d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_2$H$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_2$H$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C2H4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C2H4_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_2$H$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C2H4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C2H4,0,max,0,FM Burner,r^,g,LaTeX
+d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_8$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_8$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H8.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H8_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_8$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H8_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H8,0,max,0,FM Burner,r^,g,LaTeX
+d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_6$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_6$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_C3H6.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_C3H6_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, C$_3$H$_6$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_C3H6_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_C3H6,0,max,0,FM Burner,r^,g,LaTeX
+d,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,Exp,ko,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_5mm.csv,1,2,XO2,eta,FDS 0.5 cm,k-,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, CH$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_1cm.csv,1,2,XO2,eta,FDS 1.0 cm,k--,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, CH$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,LaTeX
+f,FM Burner,Submodules/macfp-db/Extinction/FM_Burner/Experimental_Data/Combustion_efficiency/FM_Zeng_2017_Eta_CH4.csv,1,2,X_O2,ETA_NORM,blank,blank,-10000,10000,,-10000,10000,-10000,10000,0,FM_Burner/FM_15cm_Burner_CH4_2cm.csv,1,2,XO2,eta,FDS 2.0 cm,k-.,-10000,0.205,,-10000,10000,-10000,10000,0,"Combustion Efficiency, CH$_4$",O$_2$ Volume Fraction,$\eta$,0.08,0.22,1,0,1.2,1,no,0.05 0.90,SouthEast,,1,FM_Burner/FM_15cm_Burner_CH4_5mm_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/FM_Burner/eta_CH4,0,max,0,FM Burner,r^,g,LaTeX
 s,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
 d,LLNL Enclosure,LLNL_Enclosure/LLNL_Extinction.csv,1,2,HRR_1,Time_1,Exp,k-,0,10000,,195,205,-10000,10000,0,LLNL_Enclosure/LLNL_01_devc.csv,2,3,HRR,Time,FDS,k--,0,10000,,180,250,-10000,10000,0,"Extinction Time, Test 1",HRR (kW),Time (s),0,500,1,0,2000,1,yes,0.05 0.90,East,,1,LLNL_Enclosure/LLNL_01_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/LLNL_Enclosure/LLNL_Extinction_Test_1,Extinction Time,max,0,LLNL Enclosure,k+,k,TeX
 d,LLNL Enclosure,LLNL_Enclosure/LLNL_Extinction.csv,1,2,HRR_2,Time_2,Exp,k-,0,10000,,195,205,-10000,10000,0,LLNL_Enclosure/LLNL_02_devc.csv,2,3,HRR,Time,FDS,k--,0,10000,,180,250,-10000,10000,0,"Extinction Time, Test 2",HRR (kW),Time (s),0,500,1,0,2000,1,yes,0.05 0.90,East,,1,LLNL_Enclosure/LLNL_02_git.txt,linear,FDS_Validation_Guide/SCRIPT_FIGURES/LLNL_Enclosure/LLNL_Extinction_Test_2,Extinction Time,max,0,LLNL Enclosure,k+,k,TeX