Misc updates including work on using Sueur model with simulator v2