Simulator fixes and collecting timing information