fixes and improvements for the simulation process