small fixes
updates to fix handling of free air trials and remove FT, FA from 2d cases. also added code to output a single comprehensive output file