Simulation:  minor improvements