diff --git a/CAROLFIRE/CAROLFIRE_PT_1.csv b/CAROLFIRE/CAROLFIRE_PT_1.csv
index 858ebf9a9..8715e6688 100644
--- a/CAROLFIRE/CAROLFIRE_PT_1.csv
+++ b/CAROLFIRE/CAROLFIRE_PT_1.csv
@@ -1,4 +1,4 @@
-"Time","Shroud","Cable 1","Cable 2","Cable 3","Cable 4","Cable 5"
+Time,Shroud,Cable 1,Cable 2,Cable 3,Cable 4,Cable 5
 -0.5,24.2,24.5,24.7,24.5,23.5,23.5
 0.5,24.2,24.6,24.7,24.5,23.5,23.5
 1.5,24.3,24.6,24.7,24.5,23.4,23.5
diff --git a/Frankman_Vegetation/frankman.csv b/Frankman_Vegetation/frankman.csv
index 3a02e1e75..cc1d0344a 100644
--- a/Frankman_Vegetation/frankman.csv
+++ b/Frankman_Vegetation/frankman.csv
@@ -1,4 +1,4 @@
-Time,"SmEx15","SmEx25","SmEx35","SmEx45","LgEx15","LgEx25","LgEx35","LgEx45","Pine15","Pine25","Pine35","Pine45"
+Time,SmEx15,SmEx25,SmEx35,SmEx45,LgEx15,LgEx25,LgEx35,LgEx45,Pine15,Pine25,Pine35,Pine45
 s,C,C,C,C,C,C,C,C,C,C,C,C
 0,62,27,25,9,98,47,33,22,87,47,27,18
 100,62,27,25,9,98,47,33,22,87,47,27,18
diff --git a/LLNL_Enclosure/LLNL_Extinction.csv b/LLNL_Enclosure/LLNL_Extinction.csv
index ad777af7b..88f112235 100644
--- a/LLNL_Enclosure/LLNL_Extinction.csv
+++ b/LLNL_Enclosure/LLNL_Extinction.csv
@@ -1,4 +1,4 @@
-"Time_1","HRR_1","Time_2","HRR_2","Time_3","HRR_3","Time_4","HRR_4","Time_5","HRR_5","Time_6","HRR_6","Time_7","HRR_7","Time_8","HRR_8","Time_9","HRR_9","Time_10","HRR_10","Time_11","HRR_11","Time_12","HRR_12","Time_13","HRR_13","Time_14","HRR_14","Time_15","HRR_15","Time_16","HRR_16","Time_17","HRR_17","Time_18","HRR_18","Time_19","HRR_19","Time_20","HRR_20","Time_21","HRR_21","Time_22","HRR_22","Time_23","HRR_23","Time_24","HRR_24","Time_25","HRR_25","Time_26","HRR_26","Time_27","HRR_27","Time_28","HRR_28","Time_29","HRR_29","Time_30","HRR_30","Time_31","HRR_31","Time_32","HRR_32","Time_33","HRR_33","Time_34","HRR_34","Time_35","HRR_35","Time_36","HRR_36","Time_37","HRR_37","Time_38","HRR_38","Time_39","HRR_39","Time_40","HRR_40","Time_41","HRR_41","Time_42","HRR_42","Time_43","HRR_43","Time_44","HRR_44","Time_45","HRR_45","Time_46","HRR_46","Time_47","HRR_47","Time_48","HRR_48","Time_49","HRR_49","Time_50","HRR_50","Time_51","HRR_51","Time_52","HRR_52","Time_53","HRR_53","Time_54","HRR_54","Time_55","HRR_55","Time_56","HRR_56","Time_57","HRR_57","Time_58","HRR_58","Time_59","HRR_59","Time_60","HRR_60","Time_61","HRR_61","Time_62","HRR_62","Time_63","HRR_63","Time_64","HRR_64"
+Time_1,HRR_1,Time_2,HRR_2,Time_3,HRR_3,Time_4,HRR_4,Time_5,HRR_5,Time_6,HRR_6,Time_7,HRR_7,Time_8,HRR_8,Time_9,HRR_9,Time_10,HRR_10,Time_11,HRR_11,Time_12,HRR_12,Time_13,HRR_13,Time_14,HRR_14,Time_15,HRR_15,Time_16,HRR_16,Time_17,HRR_17,Time_18,HRR_18,Time_19,HRR_19,Time_20,HRR_20,Time_21,HRR_21,Time_22,HRR_22,Time_23,HRR_23,Time_24,HRR_24,Time_25,HRR_25,Time_26,HRR_26,Time_27,HRR_27,Time_28,HRR_28,Time_29,HRR_29,Time_30,HRR_30,Time_31,HRR_31,Time_32,HRR_32,Time_33,HRR_33,Time_34,HRR_34,Time_35,HRR_35,Time_36,HRR_36,Time_37,HRR_37,Time_38,HRR_38,Time_39,HRR_39,Time_40,HRR_40,Time_41,HRR_41,Time_42,HRR_42,Time_43,HRR_43,Time_44,HRR_44,Time_45,HRR_45,Time_46,HRR_46,Time_47,HRR_47,Time_48,HRR_48,Time_49,HRR_49,Time_50,HRR_50,Time_51,HRR_51,Time_52,HRR_52,Time_53,HRR_53,Time_54,HRR_54,Time_55,HRR_55,Time_56,HRR_56,Time_57,HRR_57,Time_58,HRR_58,Time_59,HRR_59,Time_60,HRR_60,Time_61,HRR_61,Time_62,HRR_62,Time_63,HRR_63,Time_64,HRR_64
 0,200,0,200,0,400,0,300,0,50,0,100,0,100,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,100,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,150,0,250,0,250,0,250,0,100,0,100,0,100,0,100,0,100,0,200,0,200,0,250,0,200,0,150,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,200,0,100,0,200,0,200,0,200,0,200,0,400,0,200,0,400,0,50,0,100
 560,200,545,200,300,400,385,300,2770,50,1295,100,1240,100,555,200,4220,200,6050,200,4780,200,5440,200,5150,200,5090,200,4070,100,6560,200,3980,200,4840,200,5110,200,6570,200,6570,200,950,200,4260,200,1480,200,2050,200,4100,200,540,200,1870,150,1520,250,4080,250,4160,250,4110,100,5100,100,4280,100,4110,100,4060,100,520,200,4100,200,430,250,4290,200,970,150,5120,200,570,200,2670,200,810,200,960,200,730,200,520,200,970,200,4730,200,3360,200,4680,200,1540,200,4180,200,4120,100,1240,200,5390,200,4090,200,4090,200,2680,400,2730,200,2660,400,3240,50,3570,100
 560,0,545,0,300,0,385,0,2770,0,1295,0,1240,0,555,0,4220,0,6050,0,4780,0,5440,0,5150,0,5090,0,4070,0,6560,0,3980,0,4840,0,5110,0,6570,0,6570,0,950,0,4260,0,1480,0,2050,0,4100,0,540,0,1870,0,1520,0,4080,0,4160,0,4110,0,5100,0,4280,0,4110,0,4060,0,520,0,4100,0,430,0,4290,0,970,0,5120,0,570,0,2670,0,810,0,960,0,730,0,520,0,970,0,4730,0,3360,0,4680,0,1540,0,4180,0,4120,0,1240,0,5390,0,4090,0,4090,0,2680,0,2730,0,2660,0,3240,0,3570,0
diff --git a/McCaffrey_Plume/McCaffrey_Plume.csv b/McCaffrey_Plume/McCaffrey_Plume.csv
index a5b3bba29..b093de49d 100644
--- a/McCaffrey_Plume/McCaffrey_Plume.csv
+++ b/McCaffrey_Plume/McCaffrey_Plume.csv
@@ -1,4 +1,4 @@
-"Height","Temp 14 kW","Vel 14 kW","Temp 22 kW","Vel 22 kW","Temp 33 kW","Vel 33 kW","Temp 45 kW","Vel 45 kW","Temp 57 kW","Vel 57 kW"
+Height,Temp 14 kW,Vel 14 kW,Temp 22 kW,Vel 22 kW,Temp 33 kW,Vel 33 kW,Temp 45 kW,Vel 45 kW,Temp 57 kW,Vel 57 kW
 0.0,872.48,0.00,872.48,0.00,872.48,0.00,872.48,0.00,872.48,0.00
 0.1,872.48,2.16,872.48,2.16,872.48,2.16,872.48,2.16,872.48,2.16
 0.2,872.48,3.05,872.48,3.05,872.48,3.05,872.48,3.05,872.48,3.05
diff --git a/SP_AST/SP_AST_Test_1_exp.csv b/SP_AST/SP_AST_Test_1_exp.csv
index 0a48ff9f8..7dc863ea8 100644
--- a/SP_AST/SP_AST_Test_1_exp.csv
+++ b/SP_AST/SP_AST_Test_1_exp.csv
@@ -1,4 +1,4 @@
-Time,"C1,A1","C2,A2","C3,A3","C4,A4","C5,A5","C6,A6","C7,A7","C8,A8","C9,B1","C10,B2","C11,B3","C12,B4","C13,B5","C14,B6","C15,B7","C16,B8","C17,C1","C18,C2","C19,C3","C20,C4","C21,PT1","C22,PT2","C23,PT3","C24,PT4","C25,PT5","C26,PT6","C27,PT7","C28,PT8","C29,PT9","C30,PT10","C31,PT11","C32,PT12","C33,C5","C34,C6","C35,C7","C36,C8","C41,QT1","C42,QT2","C43,QT3","C44,QT4","C45,WT1","C46,WT2","C47,WT3","C48,WT4","C49,TC2","C50,TC4","C51,TC6","C52,TC8","C53,TC10","C54,TC12",AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
+Time,C1,A1,C2,A2,C3,A3,C4,A4,C5,A5,C6,A6,C7,A7,C8,A8,C9,B1,C10,B2,C11,B3,C12,B4,C13,B5,C14,B6,C15,B7,C16,B8,C17,C1,C18,C2,C19,C3,C20,C4,C21,PT1,C22,PT2,C23,PT3,C24,PT4,C25,PT5,C26,PT6,C27,PT7,C28,PT8,C29,PT9,C30,PT10,C31,PT11,C32,PT12,C33,C5,C34,C6,C35,C7,C36,C8,C41,QT1,C42,QT2,C43,QT3,C44,QT4,C45,WT1,C46,WT2,C47,WT3,C48,WT4,C49,TC2,C50,TC4,C51,TC6,C52,TC8,C53,TC10,C54,TC12,AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
 0.6,24,24,24,24,24,24,23,24,24,24,24,24,24,24,24,24,24,24,24,24,26,26,26,26,26,26,27,26,25,25,28,25,24,24,24,24,25,25,24,24,25,24,24,24,25,25,25,25,25,25,26,26,26,26,26,26,28,26,25,25,28,25
 10.8,24,24,24,24,24,24,23,24,24,24,24,24,24,24,24,24,24,24,24,24,27,26,26,27,26,26,27,26,25,25,28,25,24,24,24,24,49,25,26,26,100,27,28,29,27,28,26,28,26,27,52,28,31,50,61,32,33,53,28,26,30,28
 21,28,26,25,25,26,28,19,30,27,26,25,26,25,25,28,29,26,25,25,25,50,31,29,43,40,30,30,36,34,29,31,31,25,26,26,27,369,91,69,99,580,194,136,181,121,118,105,135,112,138,303,120,73,237,255,143,83,202,147,87,75,115
diff --git a/SP_AST/SP_AST_Test_2_exp.csv b/SP_AST/SP_AST_Test_2_exp.csv
index 6dd472736..b0b563112 100644
--- a/SP_AST/SP_AST_Test_2_exp.csv
+++ b/SP_AST/SP_AST_Test_2_exp.csv
@@ -1,4 +1,4 @@
-Time,"C1,A1","C2,A2","C3,A3","C4,A4","C5,A5","C6,A6","C7,A7","C9,B1","C10,B2","C11,B3","C12,B4","C13,B5","C14,B6","C15,B7","C17,C1","C18,C2","C19,C3","C20,C4","C21,PT1","C22,PT2","C23,PT3","C24,PT4","C25,PT5","C26,PT6","C27,PT7","C28,PT8","C29,PT9","C30,PT10","C31,PT11","C32,PT12","C33,C5","C34,C6","C35,C7","C41,QT1","C42,QT2","C43,QT3","C44,QT4","C45,WT1","C46,WT2","C47,WT3","C48,WT4","C49,TC2","C50,TC4","C51,TC6","C52,TC8","C53,TC10","C54,TC12",AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
+Time,C1,A1,C2,A2,C3,A3,C4,A4,C5,A5,C6,A6,C7,A7,C9,B1,C10,B2,C11,B3,C12,B4,C13,B5,C14,B6,C15,B7,C17,C1,C18,C2,C19,C3,C20,C4,C21,PT1,C22,PT2,C23,PT3,C24,PT4,C25,PT5,C26,PT6,C27,PT7,C28,PT8,C29,PT9,C30,PT10,C31,PT11,C32,PT12,C33,C5,C34,C6,C35,C7,C41,QT1,C42,QT2,C43,QT3,C44,QT4,C45,WT1,C46,WT2,C47,WT3,C48,WT4,C49,TC2,C50,TC4,C51,TC6,C52,TC8,C53,TC10,C54,TC12,AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
 0.6,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,28,27,28,27,27,27,29,27,27,27,29,27,27,26,26,27,26,26,26,27,26,26,26,26,27,27,27,26,27,28,27,28,27,27,25,29,28,28,28,31,29
 10.8,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,28,27,28,28,27,27,29,28,27,27,29,27,27,26,26,43,27,27,28,80,27,28,29,27,29,27,28,28,28,35,28,31,37,30,25,31,31,122,72,60,87
 21,29,28,27,29,27,27,27,28,28,27,27,27,26,27,27,27,27,27,46,30,30,41,38,30,31,34,33,30,31,31,27,27,27,325,70,53,96,507,140,96,174,73,103,75,101,88,113,239,71,55,187,171,25,51,122,216,182,128,198
diff --git a/SP_AST/SP_AST_Test_3_exp.csv b/SP_AST/SP_AST_Test_3_exp.csv
index be1763e46..868c52fec 100644
--- a/SP_AST/SP_AST_Test_3_exp.csv
+++ b/SP_AST/SP_AST_Test_3_exp.csv
@@ -1,4 +1,4 @@
-Time,"C1,A1","C2,A2","C3,A3","C4,A4","C5,A5","C6,A6","C7,A7","C9,B1","C10,B2","C11,B3","C12,B4","C13,B5","C14,B6","C15,B7","C17,C1","C18,C2","C19,C3","C20,C4","C21,PT1","C22,PT2","C23,PT3","C24,PT4","C25,PT5","C26,PT6","C27,PT7","C28,PT8","C29,PT9","C30,PT10","C31,PT11","C32,PT12","C33,C5","C34,C6","C35,C7","C41,QT1","C42,QT2","C43,QT3","C44,QT4","C45,WT1","C46,WT2","C47,WT3","C48,WT4","C49,TC2","C50,TC4","C51,TC6","C52,TC8","C53,TC10","C54,TC12",AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
+Time,C1,A1,C2,A2,C3,A3,C4,A4,C5,A5,C6,A6,C7,A7,C9,B1,C10,B2,C11,B3,C12,B4,C13,B5,C14,B6,C15,B7,C17,C1,C18,C2,C19,C3,C20,C4,C21,PT1,C22,PT2,C23,PT3,C24,PT4,C25,PT5,C26,PT6,C27,PT7,C28,PT8,C29,PT9,C30,PT10,C31,PT11,C32,PT12,C33,C5,C34,C6,C35,C7,C41,QT1,C42,QT2,C43,QT3,C44,QT4,C45,WT1,C46,WT2,C47,WT3,C48,WT4,C49,TC2,C50,TC4,C51,TC6,C52,TC8,C53,TC10,C54,TC12,AST1,AST2,AST3,AST4,AST5,AST6,AST7,AST8,AST9,AST10,AST11,AST12
 0.6,32,31,31,31,31,31,31,32,32,32,32,31,31,31,33,32,32,32,39,35,34,35,39,35,35,36,39,35,37,36,33,32,32,38,32,30,33,38,32,31,33,32,33,34,34,34,35,39,35,34,35,39,35,36,36,39,36,37,36
 10.8,32,31,31,31,31,31,31,32,32,32,32,32,31,31,33,32,32,32,39,35,34,35,39,35,35,36,39,35,37,36,33,32,32,52,37,35,38,83,45,42,51,38,41,35,36,35,36,44,37,41,39,40,36,38,38,40,37,40,38
 21,34,33,33,34,33,33,33,33,33,33,33,32,32,32,33,33,33,33,55,41,41,44,45,39,38,40,42,38,39,39,33,33,33,362,146,106,182,527,231,169,315,161,195,109,117,112,114,226,125,125,150,129,90,75,101,102,93,80,93
diff --git a/Submodules/macfp-db b/Submodules/macfp-db
index 4a3c125e5..d05eb2293 160000
--- a/Submodules/macfp-db
+++ b/Submodules/macfp-db
@@ -1 +1 @@
-Subproject commit 4a3c125e531dd0610d387f1d277d0afba646f582
+Subproject commit d05eb22935118a2c5c74a7e3efb75e0362c1c00c
diff --git a/Submodules/matl-db b/Submodules/matl-db
index 886204877..83cb19bbe 160000
--- a/Submodules/matl-db
+++ b/Submodules/matl-db
@@ -1 +1 @@
-Subproject commit 8862048771accacf7ae7cd797a292d421b38b5eb
+Subproject commit 83cb19bbe903ba05324738eaa6ceea76df122117