Changes to code and new raw data
Merge fixes
Updates to simulation files