Make timeout as a command line parameter (-T)
Fix some values in the simulator.