improvements of the simulator