Minor updates to simulation, etc.