Data Generation Mode Updates

Several updates to fix bugs/ address future needs in SWF for use in data generation mode.